big changes made - work templates now fully functional