Lot's of work on templating, especially insertion points.