Branching for a large refactor of control design
Successful refactor of control types