Added a couple methods to ESClient, and a model change.
Fixed commit issues
Refixed commit problems.
Rerefixed commit issues