UUID overhaul.
Unification of behaviour #1
Fixing previous commit.