Starting to work on Index
Updates to include ElasticSearch