Lot's of work

Worked on a lot of stuff. Classes are a bit better too