Pt2 almost done