Class creation
CHANGES :dancers:
Merge with master
Merge with master... again :feelsgood: