Got rid of done //TODOs
Merge pull request #6 from tatwater/Tony

Got rid of done //TODOs