Afdp 48

Implementation of editing. And yes, all functional tests pass ;)