My part done
Done
Done with everything; not touching DataManager
Actually done this time
Merging my stuff and Dan's. Finalized my stuff. There appears to be signficant crap introduced by our failure to use GITIGNORE...
Merge pull request #3 from praccu/master

As Per Request