More work on challenges.
Respond to challenge logic works.
makes code nicer.