refactoring controls - early stage