Delete the class method shenannigans
Change to a multi-registry format