almost done with hw2, add new stuff