Whoops.  Big commit full of fancy!