finished writing out most of the classes and their tests