Class and Page templates working mostly