commits through pset 6... long overdue