Added (then fixed) templates with multiple parameters for both classes and functions!