Starting to refine some classes and stuff
Moooore objects adding