Uuid features

Merging.