Pre-merge commit, working on UUID loading