Factor out new relationship component. Fix issues where form states weren't resetting