Complete overhaul of templating in timber.
Why? We were using it wrong! I think this will be a better design.