Initial Commit of new template version