Updated Class2, started work on supplement