Extensions_v0.17

Potentially working version of template mapping extraction.  Still needs
validation...