Sort of finished the E-part in the EM, but not in proper framework yet.
Redo that after solve the M-part