Lots more work on the challenge design section