WIP: started work on integrating elasticsearch