Template builder take two