Major dev changes to use ElasticSearch