I'm almost done with the template override patch.