Long Day

It was a long day, but the refactoring that I started yesterday is done, at least for a bit.

Tomorrow, it's back to debugging. :)