Partway through refactor to new class based registry for Actors