This should be completed in a separate branch. When every ticket in this milestone is complete and all edge cases and nuanced behaviour is understood then it can be merged into main.