finished Template. Working on Template Management