Some class work and WIP