started working on template views but paige made other changes i want on my branch