Hw2 branch

Turning in as far as I could get with HW2.