Add a bunch of changes for class 2.