Assignment 3: Moved methods up in hierarchy, fixed imports