Work

merging code prior to db upgrade.