Some MotherBrain refactor.

Brought in some changes to help configure MotherBrain.