Moved templates over. Implemented seven point system