Add some TODOs
Merge branch 'master' of https://github.com/chrskly/wtchr