Some more ES progress