edd and eddlib merged (untested)