Start the switch to a more shortcut oriented approach