Reminded myself about classes
Merged with master