Place the TODOs in the correct position
Merge pull request #110 from grappler/patch-1

Place the TODOs in the correct position