HW2: another progress commit, almost done.