Added most of template