update all references to new classes, now compiles. Still need tests.