Initial merge and dataset

Current build with some database dumps of around 2500 entries.