Added a todo, and removed a couple that are finished