Further work done on wizard-to-database persistence.