nearly completed the switch to UID and have settled on the dict structure