including es

keeping this PR open as I work on heroes boxen setup.

will let people know when its ready to merge