Rolled it back to use a data var first to sort out templates