Copied EES files back from 4.2

Signed-off-by: Ian bell <ian.h.bell@gmail.com>