changed all units to be templates