Progress check-in.
Refactoring, progress checkin.