WIP: deletion
First shot at turning external IDs into regular nested records