Added some TODOs
Merge branch 'master' of github.com:iChun/Morph