More PID work (may operate correctly, pending test)