TODO

Added TODO's and some comments. Lets get this ball rolling!