pre-class commit 12/15, includes hw2