Revert "Revert "challenges""

This reverts commit 9eaadce87de4fdf096e83c133393a3b6554d9961.