move stuff around in preparation for new power switch