moved challenges into one class