Last batch of changes before making new template live.
Pushed once more to include database changes