Completed TODO 1 - 4 of HW 2