got part 2 done, fixed part 1