Switch on prior to any other actions
Refactoring - attempt to introduce generic buttons