challenge 1 now works
resolved merging