WIP, but this is mostly working....  Need to test with remote control and new hook ups for power switches...