Added series of todos.
Merge pull request #1 from tatwater/Tony

Added series of todos.