Homework 2 almost done