Most recent changes. Mostly templating.