add some TODO comments
Merge pull request #33 from clockfly/master

add some TODO comments