add some todos
Merge pull request #22 from anitsan/working/21