organize TODOs
Merge pull request #15 from yetanotherhacker/todotodo

organize TODOs