refactoring nearly complete and integrated into site.  updatedb utilities need to be updated in site still