Hw2

Merging in changes for HW2.