Teams now working - can you take from here?
Merge pull request #1 from NathanielWroblewski/master

Teams now working