Updated TODOs
Merge branch 'master' of github.com:mjp2ff/here