Hw2 upload

Possibly finished hw2. Still needs testing.