Refactor, working on improving how new controls are added.