Started a partial rewrite of the registry class(es)