beginning of refactoring unit to use uuids and other similar changes.