I'm leaving it unmerged for now until we can see if we can make templates work like tables for all things, except the changes we _want_.