Update for tourneys

adding-2.0 branch is too far behind, creating new branch from master and updating.