WIP: added editability