New database with the tidied up schema

Subject to change
Merge pull request #191 from FWAJL/dev

New database with the tidied up schema