edm_1 done, but need to review naming scheme and simplify a bit