Implement more of HW 4