So many registries

More registry fixes. Almost there now