Goldman Sachs counsel joins Olympic team