Wout: Added checkpoint + checkpointmanager