Mostly upgrade to 0.7.  Mostly.