Almost there with the UUIDs