Removed a TODO, and added a new one