Toggle power logic improved
Removed older test file

Redundant and less code from when we finished last week.