3

Lots of changes, started the class cpp file.