Overhauling to get a common control starting point