data classes are done, ready to start pumping data into groups
Merge branch 'James' of https://github.com/CS560/Project into James