success merge and addition of challenge controller stuff