Further work done on feeding database information to the wizard.