Lots of updates

Class done!