Latest wip messing around with classes, etc.