Adding teammate tracking to team solutions, nearly finished with the awful front-page re-splitting