Finished Challenge 1 and 2

Still need to reflect and refactor