Revamp this a bit so it returns on the controls future by default.