Wiring

I meant to merge this in before I left on vacation, but it slipped through the cracks.  Guess what I just realized today.

At any rate, this is the wiring code I demo'ed at the end of last quarter.