new class files, should work now