All methods for HW7 completed