Now only need p2: the debugging, and p3: the resizening... But happy this is out of the way. Ref T2438