This makes me think we should add an option to register that calls this without having to call it externally.