[WIP] Feature/elasticsearch