Expanded so able to do a team of 16 (17 with row 0)