Done the first stage of EDM types. fixes #5