New database with the tidied up schema

Subject to change