Checkpoint, work in progress, couple of fixmes still hanging