Another attempt at #48

This one with a deeper change
a checkpoint
a non-compiling checkpoint
things are basicaly working...

more testing needed