Merge pull request #30 from skotchvail/redesign_totalcontrolconsumer

Redesign totalcontrolconsumer