move the todos to a better place