checkpoint
cleanup
cleanup and minimal working version