Added more objects to the class, fixed up accessors