Comments
Jiggled things around a bit into different classes and cs files
Add Comments