added mostly-done hw2