Added more methods. Decided against using inheritance and am sticking with composition.