wip/xedit
