Need to extract template vars - oops