ElasticSearch integration
Merge branch 'david-new-datamodel' into new-datamodel