Completed challenges

Challenge 2 output still includes challenge 1 output