EESM 2.0

To keep the new stuff separated from the old, so it's clear what's what.