Merge "First bits of "add a mode"" into main