switch over to the new templates class