[WIP] More templates

One more error to fix.