checkpoint w/ TODOs