Support for E/E format. Still some checking/bug-fixings required, but basically appears to be working.