Refactor Power Switch #48

Closed
muellerr wants to merge 3 commits from mueller/refactor-power-switch-if-etc into eive/develop