Converted to UUIDs.
More bugs fixed with UUID.
Continued fixes for UUIDs