Introduced the registrar to separate concerns. Code is working, except if file system logging is enabled, this needs to be diagnosed.