moved todos to the right locations