Cleanup
- Add a todo list
- Cleanup some of the //TODO