manual generation of S3 types....
checkin
checkpoint
savepoint
Lots of fixes....