Challenge1 completed submission, fixes challenge2a