Migrated to new db
merged changes related to new database schema
commented out off-target bits from user interface for now