Feature/registry

Early merge, since I refactored/updated some other stuff. Client is still as basic as possible.