checkpoint, still bugfixing