added to templates, work on combining pages