Lots of commits here.  Manic-coding session