Challenge Blocks working a lot better and using an event for future
proofing