Lot's of work done on templating!