v.14 stable - 6th phase of templating

Everything is fine. (before starting work on optimization)