Fixes #49 initial commit
Merge pull request #50 from ddevore/wip-49-es

Fixes #49 initial commit