Reorganized database propagation code; preparing for more work to be done in main menu