Completed challenge 1 and challenge 2