bit of refactoring and add (very) preliminary support for new style TeamBrackets