New: initial prototype of our template expander