Data Classes and some small additions
The old stuff
Merge pull request #1 from kguischard13/master

Data Classes and some small additions