Account for subparts in the template layer. Does not fix TOC
Merge pull request #216 from cmc333333/subpart

Account for subparts in the template layer. Does not fix TOC