Got separation of controls working right