more work on stencil functions
Merge branch 'overhaul' of darwin:scout into overhaul