ok- now the classes are set up right