Began refactoring client controls