Part 1 done
Edited for hw 3