hw2 added, hw1 figured out