Beginning to implement a better class system - still borked