Halfway there...

Finished with all classes (I hope...) now creating test and probably
looking for errors that might occur.