Created a Control class to replace the current dictionary objects, which are unwieldy.