PROPOSAL - add team index

- [x] @HelenRoss 
- [x] @evilmarty