diff --git a/format-master.xml b/format-master.xml
index d891960..a4dc9ad 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -1417,10 +1417,46 @@
 		<latex>\usepackage<xsl:if test="@options">[<xsl:value-of select="@options"/>]</xsl:if>{<xsl:value-of select="."/>}</latex>
 	</template>
 		
+	<!--
+		Execute a preamble LaTeX command. Use to set up things like
+		counters, fonts, hyperref options, etc.
+	-->
 	<template name="latex-command" match="latex-commands/command">
 		<latex><xsl:value-of select="."/></latex>
 	</template>
 	
+
+	<!--
+		Hmm, the following may be more complex than I thought...
+		External environment files sort of stuff it up. Perhaps
+		LaTeX document class stuff should be in attributes of the
+		document element?
+	-->
+	<!--
+		Specify LaTeX document class and options. The master stylesheet
+		specifies \documentclass[a4paper,12pt]{article}. Anything you
+		specify here will override that completely, so be sure to set
+		a4paper and 12pt if that's what you want.
+		
+		@options: The required document class options. [optional]
+	-->
+	<template name="latex-documentclass" match="latex-documentclass|documentclass">
+		<latex>\documentclass{<xsl:value-of select="."/>}</latex>
+	</template>
+	<template name="latex-documentclass" match="latex-documentclass[@options]|documentclass[@options]">
+		<latex>\documentclass[<xsl:value-of select="@options"/>]{<xsl:value-of select="."/>}</latex>
+	</template>
+	
+	<!--
+		Specify additional LaTeX document class options (i.e., in
+		addition to the defaults). These should be a comma-separated
+		list of the required options. These will be appended to the
+		standard defaults (a4paper, 12pt).
+	-->
+	<template name="latex-document-options" match="latex-document-options">
+		<latex><xsl:apply-templates/></latex>
+	</template>
+	
 	
 	<!-- Sometimes we might need to embed raw code to handle something tricky. -->
 	<template name="raw-latex" match="raw-code[@format = 'latex']">