Moved control out to class library.