Almost done with basic WF editing