added TODOs for tomorrows work