Added organization, plus the template I forgot about