WIP for when referencing uses URIs
2 files changed