Moving templating to an actual node override, tweaking mate handling