started preperations for moving to template system