hw2 mostly finished pt2