New schema

testing merge of new database schema