4:00 on Saturday.  More refactoring.