DONE. But need to change location of code in ChallengePanel