Major restructure and rewrite to start to enable versioning
Renaming uklregistry to registry
Fixed up missing rigid property arguments