Added hw2 stuff