Added team creation & Lots more template work