Amonmoce

Hey Clive ... maybe you can see if you can merge with your merge and then ... modify (change the way it checks if the team is correct) and then merge with the master branch when it's okay