Refactored everything into new control interface.