Take the training wheels off more bcm modules and temporarily import q3-challenge module to track experimental changes