Rewiring some things

Still haven't implemented 24V power supply.