Committing code from this past weekend.  Whee.