Closing in on first decent pass at this.  Still a lot of cleanup.