Linking teams and putting rpi in its own column