Updated with work on integrating the Multiple Choice xsl template