DEDS almost done (except comments)