@antollinim just a quick note - I'm updating this PR to reflect my comments above - no need to switch gears - the Resource Reference stuff is more important at the moment :)