Wrapping up Gyms and other challenges

Clipped by havrsack