Part2 Done!

Need to test!