Probably, but need to see where we end up with refactoring post registrations first.