ES generational variant complete and other edits.

The initial ES variant is completed. However, requires verification and
validation.