Added the concept of super into both files.  Reorderded the content of each method to work correctely with super.