Clean up, added Todo list