did a lot of work.  I promise I'll commit more often tomorrow...