Add some commenting, use built-in elasticsearch