Added two more template files... they still need to be generalized