More work on JS stencil
More work on stencils