Played around with classes for a while
Will be looking to finish tomorrow