Almost completed

Will review what need to be altered during lunch.
My original homework attempt is viewable in the previous commits.