Added TODOs
Added a couple more TODOs
Thinking about nicks