Removed subclass functions and setting up superclass