lots of style, naming convention, commented out broken tests