Merge pull request #5 from tatwater/Tony

Cleaned up all uncessary References
Got rid of done //TODOs