diff --git a/apa-5th-edition.csl b/apa-5th-edition.csl
index e53978208e7d..7e22c594594e 100644
--- a/apa-5th-edition.csl
+++ b/apa-5th-edition.csl
@@ -2,7 +2,7 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
   <info>
     <title>American Psychological Association 5th edition</title>
-    <title-short>APA</title-short>
+    <title-short>APA (5th ed.)</title-short>
     <id>http://www.zotero.org/styles/apa-5th-edition</id>
     <link href="http://www.zotero.org/styles/apa-5th-edition" rel="self"/>
     <link href="http://rdc.libguides.com/content.php?pid=63487" rel="documentation"/>
diff --git a/apa-6th-edition.csl b/apa-6th-edition.csl
new file mode 100644
index 000000000000..810702be8fb3
--- /dev/null
+++ b/apa-6th-edition.csl
@@ -0,0 +1,1526 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
+  <info>
+    <title>American Psychological Association 6th edition</title>
+    <title-short>APA (6th ed.)</title-short>
+    <id>http://www.zotero.org/styles/apa-6th-edition</id>
+    <link href="http://www.zotero.org/styles/apa-6th-edition" rel="self"/>
+    <link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
+    <author>
+      <name>Simon Kornblith</name>
+      <email>simon@simonster.com</email>
+    </author>
+    <author>
+      <name> Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
+    <contributor>
+      <name>Bruce D'Arcus</name>
+    </contributor>
+    <contributor>
+      <name>Curtis M. Humphrey</name>
+    </contributor>
+    <contributor>
+      <name>Richard Karnesky</name>
+      <email>karnesky+zotero@gmail.com</email>
+      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
+    </contributor>
+    <contributor>
+      <name>Sebastian Karcher</name>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="psychology"/>
+    <category field="generic-base"/>
+    <updated>2016-09-28T13:09:49+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="editortranslator" form="short">
+        <single>ed. &amp; trans.</single>
+        <multiple>eds. &amp; trans.</multiple>
+      </term>
+      <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">interviewer</term>
+      <term name="circa" form="short">ca.</term>
+      <term name="collection-editor" form="short">series ed.</term>
+    </terms>
+  </locale>
+  <locale xml:lang="es">
+    <terms>
+      <term name="from">de</term>
+    </terms>
+  </locale>
+  <locale xml:lang="de">
+    <terms>
+      <term name="et-al">et al.</term>
+    </terms>
+  </locale>
+  <locale xml:lang="da">
+    <terms>
+      <term name="et-al">et al.</term>
+    </terms>
+  </locale>
+  <locale xml:lang="nn">
+    <terms>
+      <term name="et-al">et al.</term>
+    </terms>
+  </locale>
+  <locale xml:lang="nb">
+    <terms>
+      <term name="et-al">et al.</term>
+    </terms>
+  </locale>
+  <macro name="container-contributors-booklike">
+    <choose>
+      <if variable="container-title">
+        <names variable="editor translator" delimiter=", &amp; ">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          <substitute>
+            <names variable="editorial-director"/>
+            <names variable="collection-editor"/>
+            <names variable="container-author"/>
+          </substitute>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
+        <text macro="container-contributors-booklike"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text macro="container-contributors-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <choose>
+        <if variable="container-title" match="none">
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+        <text macro="secondary-contributors-booklike"/>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text term="letter" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <names variable="recipient" delimiter=", ">
+              <label form="verb" suffix=" "/>
+              <name and="symbol" delimiter=", "/>
+            </names>
+          </group>
+          <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <names variable="editor translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song">
+        <choose>
+          <if variable="original-author composer" match="any">
+            <group delimiter="; ">
+              <!-- Replace prefix with performer label as that becomes available -->
+              <names variable="author" prefix="Recorded by ">
+                <label form="verb" text-case="title"/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+              <names variable="translator">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="translator" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="secondary-contributors-booklike"/>
+          </if>
+          <else>
+            <group delimiter="; ">
+              <choose>
+                <if variable="title">
+                  <names variable="interviewer" delimiter="; ">
+                    <name and="symbol" initialize-with=". " delimiter=", "/>
+                    <label form="short" prefix=", " text-case="title"/>
+                  </names>
+                </if>
+              </choose>
+              <names variable="translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer">
+                <name and="symbol" initialize-with=". " delimiter="; "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="editor translator" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="song">
+        <names variable="composer" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </if>
+      <else-if type="treaty"/>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="long" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+                <names variable="translator">
+                  <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                  <label form="short" prefix=" (" suffix=")" text-case="title"/>
+                </names>
+              </if>
+            </choose>
+            <names variable="editor translator" delimiter=", ">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="editorial-director">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="collection-editor">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+              </if>
+            </choose>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author-short">
+    <choose>
+      <if type="patent" variable="number" match="all">
+        <text macro="patent-number"/>
+      </if>
+      <else-if type="treaty">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <choose>
+          <if variable="archive DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text variable="title" form="short" quotes="true"/>
+                </substitute>
+              </names>
+              <!-- This should be localized -->
+              <text value="personal communication"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <choose>
+                  <if variable="container-title">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <text variable="title" form="short" font-style="italic"/>
+                  </else>
+                </choose>
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="song">
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator"/>
+            <choose>
+              <if variable="container-title">
+                <text variable="title" form="short" quotes="true"/>
+              </if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else-if>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+            <names variable="editor"/>
+            <names variable="editorial-director"/>
+            <names variable="translator"/>
+            <choose>
+              <if type="report" variable="publisher" match="all">
+                <text variable="publisher"/>
+              </if>
+              <else-if type="legal_case">
+                <text variable="title" font-style="italic"/>
+              </else-if>
+              <else-if type="bill legislation" match="any">
+                <text variable="title" form="short"/>
+              </else-if>
+              <else-if variable="reviewed-author" type="review review-book" match="any">
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </else-if>
+              <else-if type="post post-weblog webpage" variable="container-title" match="any">
+                <text variable="title" form="short" quotes="true"/>
+              </else-if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="patent-number">
+    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
+    <group delimiter=" ">
+      <text variable="authority"/>
+      <choose>
+        <if variable="genre">
+          <text variable="genre" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <!-- This should be localized -->
+          <text value="patent" text-case="capitalize-first"/>
+        </else>
+      </choose>
+      <group delimiter=" ">
+        <text term="issue" form="short" text-case="capitalize-first"/>
+        <text variable="number"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else-if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <text term="retrieved" text-case="capitalize-first"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <date variable="accessed" form="text" suffix=","/>
+            </if>
+          </choose>
+          <text term="from"/>
+          <choose>
+            <if type="report">
+              <choose>
+                <if variable="author editor translator" match="any">
+                  <!-- This should be localized -->
+                  <text variable="publisher" suffix=" website:"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="post post-weblog webpage" match="any">
+              <!-- This should be localized -->
+              <text variable="container-title" suffix=" website:"/>
+            </else-if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+      <else-if variable="archive">
+        <choose>
+          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
+            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
+            <choose>
+              <if variable="archive-place" match="none">
+                <group delimiter=" ">
+                  <text term="retrieved" text-case="capitalize-first"/>
+                  <text term="from"/>
+                  <text variable="archive" suffix="."/>
+                  <text variable="archive_location" prefix="(" suffix=")"/>
+                </group>
+              </if>
+              <else>
+                <text macro="publisher" suffix="."/>
+              </else>
+            </choose>
+          </if>
+          <else>
+            <text macro="publisher" suffix="."/>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <text macro="publisher" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+        </group>
+      </if>
+      <else-if type="patent" variable="number" match="all">
+        <text macro="patent-number" font-style="italic"/>
+      </else-if>
+      <else-if variable="title">
+        <choose>
+          <if variable="version" type="book" match="all">
+            <!---This is a hack until we have a software type -->
+            <text variable="title"/>
+          </if>
+          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+            <choose>
+              <if variable="reviewed-title">
+                <choose>
+                  <if type="post post-weblog webpage" variable="container-title" match="any">
+                    <text variable="title"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </else-if>
+          <else-if type="post post-weblog webpage" variable="container-title" match="any">
+            <text variable="title"/>
+          </else-if>
+          <else>
+            <text variable="title" font-style="italic"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if variable="interviewer" type="interview" match="any">
+        <names variable="interviewer">
+          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- APA has four descriptive sections following the title: -->
+  <!-- (description), [format], container, event -->
+  <macro name="description">
+    <group prefix="(" suffix=")">
+      <choose>
+        <!-- book is here to catch software with container titles -->
+        <if type="book report" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="description-report"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <choose>
+                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
+                <if variable="DOI URL archive" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
+            </group>
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+          <group delimiter="; ">
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="song">
+          <choose>
+            <if variable="container-title" match="none">
+              <text macro="locators"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article dataset figure" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="locators"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
+          <text macro="secondary-contributors"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <group delimiter=", ">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <names variable="reviewed-author">
+              <label form="verb-short" suffix=" "/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </if>
+        <else>
+          <text macro="format-short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format-short">
+    <choose>
+      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+        <choose>
+          <if variable="reviewed-title" match="none">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </else>
+            </choose>
+          </if>
+          <else>
+            <text variable="title" form="short" quotes="true"/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="speech thesis" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report" match="any">
+        <choose>
+          <if variable="container-title" match="none">
+            <text macro="format-report"/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="manuscript pamphlet" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <text macro="secondary-contributors"/>
+      </else-if>
+      <else-if type="song">
+        <group delimiter="; ">
+          <text macro="secondary-contributors"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter=", ">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <group delimiter=", ">
+          <choose>
+            <if variable="collection-editor editor issue page volume" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case patent treaty" match="none">
+        <choose>
+          <if variable="genre medium" match="any">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text variable="medium" text-case="capitalize-first"/>
+            </group>
+          </if>
+          <else-if type="dataset">
+            <!-- This should be localized -->
+            <text value="Data set"/>
+          </else-if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="description-report">
+    <choose>
+      <if variable="number">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <text variable="genre" text-case="title"/>
+            <!-- Replace with term="number" if that becomes available -->
+            <text term="issue" form="short" text-case="capitalize-first"/>
+            <text variable="number"/>
+          </group>
+          <text macro="locators"/>
+        </group>
+      </if>
+      <else>
+        <text macro="locators"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="format-report">
+    <choose>
+      <if variable="number">
+        <text variable="medium" text-case="capitalize-first"/>
+      </if>
+      <else>
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <group delimiter=", ">
+        <choose>
+          <if type="manuscript">
+            <text variable="genre"/>
+          </if>
+        </choose>
+        <group delimiter=" ">
+          <!-- Replace "archive" with "archive_collection" as that becomes available -->
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>
+      </group>
+      <group delimiter=", ">
+        <!-- Move "archive" here when "archive_collection" becomes available -->
+        <text variable="archive-place"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="manuscript pamphlet" match="any">
+        <choose>
+          <if variable="archive archive_location archive-place" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <text macro="archive"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+      <else-if type="thesis" match="any">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
+          <text macro="archive"/>
+        </group>
+      </else-if>
+      <else-if type="patent">
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="archive"/>
+        </group>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="archive"/>
+      </else-if>
+      <else-if type="post post-weblog webpage" match="none">
+        <group delimiter=". ">
+          <choose>
+            <if variable="event">
+              <choose>
+                <!-- Only print publisher info if published in a proceedings -->
+                <if variable="collection-editor editor issue page volume" match="any">
+                  <group delimiter=": ">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                </if>
+              </choose>
+            </if>
+            <else>
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+            </else>
+          </choose>
+          <text macro="archive"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event" type="speech paper-conference" match="any">
+        <choose>
+          <!-- Don't print event info if published in a proceedings -->
+          <if variable="collection-editor editor issue page volume" match="none">
+            <group delimiter=" ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="genre">
+                    <text term="presented at"/>
+                  </if>
+                  <else>
+                    <text term="presented at" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <group delimiter=", ">
+                  <text variable="event"/>
+                  <text variable="event-place"/>
+                </group>
+              </group>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if variable="issued">
+        <group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <text variable="year-suffix"/>
+          <choose>
+            <if type="speech">
+              <date variable="issued" delimiter=" ">
+                <date-part prefix=", " name="month"/>
+              </date>
+            </if>
+            <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
+              <date variable="issued">
+                <date-part prefix=", " name="month"/>
+                <date-part prefix=" " name="day"/>
+              </date>
+            </else-if>
+            <else-if type="paper-conference">
+              <choose>
+                <if variable="container-title" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </else-if>
+            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
+          </choose>
+        </group>
+      </else-if>
+      <else-if variable="status">
+        <group>
+          <text variable="status" text-case="lowercase"/>
+          <text variable="year-suffix" prefix="-"/>
+        </group>
+      </else-if>
+      <else>
+        <group>
+          <text term="no date" form="short"/>
+          <text variable="year-suffix" prefix="-"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-sort">
+    <choose>
+      <if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
+        <date variable="issued">
+          <date-part name="year"/>
+          <date-part name="month"/>
+          <date-part name="day"/>
+        </date>
+      </if>
+      <else>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-year">
+    <group>
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="archive DOI publisher URL" match="none">
+              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
+              <date variable="issued" form="text"/>
+            </if>
+            <else>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </else>
+      </choose>
+      <text variable="year-suffix"/>
+    </group>
+  </macro>
+  <macro name="issued-citation">
+    <choose>
+      <if variable="issued">
+        <group delimiter="/">
+          <choose>
+            <if is-uncertain-date="original-date">
+              <group prefix="[" suffix="]" delimiter=" ">
+                <text term="circa" form="short"/>
+                <date variable="original-date">
+                  <date-part name="year"/>
+                </date>
+              </group>
+            </if>
+            <else>
+              <date variable="original-date">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+          <choose>
+            <if is-uncertain-date="issued">
+              <group prefix="[" suffix="]" delimiter=" ">
+                <text term="circa" form="short"/>
+                <text macro="issued-year"/>
+              </group>
+            </if>
+            <else>
+              <text macro="issued-year"/>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if variable="status">
+        <text variable="status" text-case="lowercase"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="original-date">
+    <choose>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if type="speech">
+        <date variable="original-date" delimiter=" ">
+          <date-part name="month"/>
+          <date-part name="year"/>
+        </date>
+      </else-if>
+      <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
+        <date variable="original-date" form="text"/>
+      </else-if>
+      <else>
+        <date variable="original-date">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="original-published">
+    <!--This should be localized -->
+    <choose>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if type="interview motion_picture song" match="any">
+        <text value="Original work recorded"/>
+      </else-if>
+      <else-if type="broadcast">
+        <text value="Original work broadcast"/>
+      </else-if>
+      <else>
+        <text value="Original work published"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine figure review review-book" match="any">
+        <group delimiter=", ">
+          <group>
+            <text variable="volume" font-style="italic"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </if>
+      <else-if type="article-newspaper">
+        <group delimiter=" ">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="locators-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <group>
+                <text variable="volume" font-style="italic"/>
+                <text variable="issue" prefix="(" suffix=")"/>
+              </group>
+              <text variable="page"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
+        <text macro="locators-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="version" text-case="capitalize-first"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <if is-numeric="volume" match="none"/>
+            <else-if variable="collection-title">
+              <choose>
+                <if variable="editor translator" match="none">
+                  <choose>
+                    <if variable="collection-number">
+                      <group>
+                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                        <number variable="volume" form="numeric"/>
+                      </group>
+                    </if>
+                  </choose>
+                </if>
+              </choose>
+            </else-if>
+            <else>
+              <group>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
+              </group>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <group>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+          </group>
+        </else>
+      </choose>
+      <group>
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="citation-locator">
+    <group>
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
+        <group delimiter=", ">
+          <text macro="container-title"/>
+          <text macro="locators"/>
+        </group>
+        <choose>
+          <!--for advance online publication-->
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" text-case="capitalize-first" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article dataset figure" match="any">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+            <choose>
+              <!--for advance online publication-->
+              <if variable="issued">
+                <choose>
+                  <if variable="page issue" match="none">
+                    <text variable="status" text-case="capitalize-first" prefix=". "/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="report" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="song" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="locators" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="book">
+        <choose>
+          <!-- book and software should not cite collection-title, only container-title -->
+          <if variable="container-title">
+            <text macro="container-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+        <text macro="container-booklike"/>
+      </else-if>
+      <else-if type="bill legal_case legislation treaty" match="any">
+        <text macro="legal-cites"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title collection-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <choose>
+              <if variable="container-author editor translator" match="none">
+                <group delimiter=". ">
+                  <group delimiter=": ">
+                    <text variable="collection-title" font-style="italic" text-case="title"/>
+                    <choose>
+                      <if variable="collection-title">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <number variable="collection-number" font-style="italic" form="numeric"/>
+                          <choose>
+                            <if variable="collection-number" match="none">
+                              <number variable="volume" font-style="italic" form="numeric"/>
+                            </if>
+                          </choose>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <group delimiter=": ">
+                    <text macro="container-title"/>
+                    <choose>
+                      <if variable="collection-title" is-numeric="volume" match="none">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <text variable="volume" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <!-- Replace with volume-title as that becomes available -->
+                <group delimiter=": ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                        <text variable="volume" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group delimiter="; " prefix="(" suffix=")">
+            <text macro="locators"/>
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article article-journal article-magazine article-newspaper dataset" match="any">
+        <text variable="container-title" font-style="italic" text-case="title"/>
+      </if>
+      <else-if type="paper-conference speech">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic" text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
+        <text variable="container-title" font-style="italic"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case">
+        <group prefix=", " delimiter=" ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="container-title">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <text variable="page"/>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if is-numeric="number">
+                      <!-- Replace with term="number" if that becomes available -->
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                    </if>
+                  </choose>
+                  <text variable="number"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group prefix="(" suffix=")" delimiter=" ">
+            <text variable="authority"/>
+            <choose>
+              <if variable="container-title" match="any">
+                <!--Only print year for cases published in reporters-->
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </if>
+              <else>
+                <date variable="issued" form="text"/>
+              </else>
+            </choose>
+          </group>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group prefix=", " delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number">
+                <!--There's a public law number-->
+                <text variable="number" prefix="Pub. L. No. "/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <text variable="page-first"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
+    <sort>
+      <key macro="author" names-min="8" names-use-first="6"/>
+      <key macro="issued-sort"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="issued-citation"/>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-sort" sort="ascending"/>
+      <key macro="title"/>
+    </sort>
+    <layout>
+      <group suffix=".">
+        <group delimiter=". ">
+          <text macro="author"/>
+          <choose>
+            <if is-uncertain-date="issued">
+              <group prefix=" [" suffix="]" delimiter=" ">
+                <text term="circa" form="short"/>
+                <text macro="issued"/>
+              </group>
+            </if>
+            <else>
+              <text macro="issued" prefix=" (" suffix=")"/>
+            </else>
+          </choose>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <choose>
+              <if variable="title interviewer" type="interview" match="any">
+                <group delimiter=" ">
+                  <text macro="description"/>
+                  <text macro="format"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text macro="format"/>
+                  <text macro="description"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <text macro="container"/>
+        </group>
+        <text macro="event" prefix=". "/>
+      </group>
+      <text macro="access" prefix=" "/>
+      <choose>
+        <if is-uncertain-date="original-date">
+          <group prefix=" [" suffix="]" delimiter=" ">
+            <text macro="original-published"/>
+            <text term="circa" form="short"/>
+            <text macro="original-date"/>
+          </group>
+        </if>
+        <else-if variable="original-date">
+          <group prefix=" (" suffix=")" delimiter=" ">
+            <text macro="original-published"/>
+            <text macro="original-date"/>
+          </group>
+        </else-if>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/apa-annotated-bibliography.csl b/apa-annotated-bibliography.csl
index 0934aa51d41a..ee69014eb7b4 100644
--- a/apa-annotated-bibliography.csl
+++ b/apa-annotated-bibliography.csl
@@ -1,38 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
   <info>
-    <title>American Psychological Association 6th edition (annotated bibliography with abstract)</title>
-    <title-short>APA</title-short>
+    <title>American Psychological Association 7th edition (annotated bibliography)</title>
+    <title-short>APA (annotated bibliography)</title-short>
     <id>http://www.zotero.org/styles/apa-annotated-bibliography</id>
     <link href="http://www.zotero.org/styles/apa-annotated-bibliography" rel="self"/>
     <link href="http://www.zotero.org/styles/apa" rel="template"/>
-    <link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
+    <link href="https://apastyle.apa.org/style-grammar-guidelines/references/examples" rel="documentation"/>
     <author>
-      <name>Simon Kornblith</name>
-      <email>simon@simonster.com</email>
-    </author>
-    <author>
-      <name> Brenton M. Wiernik</name>
+      <name>Brenton M. Wiernik</name>
       <email>zotero@wiernik.org</email>
     </author>
-    <contributor>
-      <name>Bruce D'Arcus</name>
-    </contributor>
-    <contributor>
-      <name>Curtis M. Humphrey</name>
-    </contributor>
-    <contributor>
-      <name>Richard Karnesky</name>
-      <email>karnesky+zotero@gmail.com</email>
-      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
-    </contributor>
-    <contributor>
-      <name>Sebastian Karcher</name>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <updated>2016-09-28T13:09:49+00:00</updated>
+    <updated>2019-12-04T13:09:49+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -42,14 +24,28 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
-      <term name="interviewer" form="short">interviewer</term>
+      <term name="interviewer" form="short">
+        <single>interviewer</single>
+        <multiple>interviewers</multiple>
+      </term>
+      <term name="collection-editor" form="short">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
       <term name="circa" form="short">ca.</term>
-      <term name="collection-editor" form="short">series ed.</term>
+      <term name="bc"> B.C.E.</term>
+      <term name="ad"> C.E.</term>
+      <term name="letter">personal communication</term>
+      <term name="letter" form="short">letter</term>
+      <term name="issue" form="long">
+        <single>issue</single>
+        <multiple>issues</multiple>
+      </term>
     </terms>
   </locale>
-  <locale xml:lang="es">
+  <locale xml:lang="da">
     <terms>
-      <term name="from">de</term>
+      <term name="et-al">et al.</term>
     </terms>
   </locale>
   <locale xml:lang="de">
@@ -57,1472 +53,1616 @@
       <term name="et-al">et al.</term>
     </terms>
   </locale>
-  <locale xml:lang="da">
+  <locale xml:lang="es">
     <terms>
-      <term name="et-al">et al.</term>
+      <term name="from">de</term>
     </terms>
   </locale>
-  <locale xml:lang="nn">
+  <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
     </terms>
   </locale>
-  <locale xml:lang="nb">
+  <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
     </terms>
   </locale>
-  <macro name="container-contributors-booklike">
-    <choose>
-      <if variable="container-title">
-        <names variable="editor translator" delimiter=", &amp; ">
-          <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          <substitute>
-            <names variable="editorial-director"/>
-            <names variable="collection-editor"/>
-            <names variable="container-author"/>
-          </substitute>
-        </names>
-      </if>
-    </choose>
-  </macro>
-  <macro name="container-contributors">
-    <choose>
-      <!-- book is here to catch software with container titles -->
-      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
-        <text macro="container-contributors-booklike"/>
-      </if>
-      <else-if type="paper-conference">
-        <choose>
-          <if variable="collection-editor container-author editor" match="any">
-            <text macro="container-contributors-booklike"/>
-          </if>
-        </choose>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="secondary-contributors-booklike">
-    <group delimiter="; ">
-      <choose>
-        <if variable="title">
-          <names variable="interviewer">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-        </if>
-      </choose>
-      <choose>
-        <if variable="container-title" match="none">
-          <group delimiter="; ">
-            <names variable="container-author">
-              <label form="verb-short" suffix=" " text-case="title"/>
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-            </names>
-            <names variable="editor translator" delimiter="; ">
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-              <label form="short" prefix=", " text-case="title"/>
-            </names>
-          </group>
-        </if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="secondary-contributors">
-    <choose>
-      <!-- book is here to catch software with container titles -->
-      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
-        <text macro="secondary-contributors-booklike"/>
-      </if>
-      <else-if type="personal_communication">
-        <group delimiter="; ">
-          <group delimiter=" ">
-            <choose>
-              <if variable="genre" match="any">
-                <text variable="genre" text-case="capitalize-first"/>
-              </if>
-              <else>
-                <text term="letter" text-case="capitalize-first"/>
-              </else>
-            </choose>
-            <names variable="recipient" delimiter=", ">
-              <label form="verb" suffix=" "/>
-              <name and="symbol" delimiter=", "/>
-            </names>
-          </group>
-          <text variable="medium" text-case="capitalize-first"/>
-          <choose>
-            <if variable="container-title" match="none">
-              <names variable="editor translator" delimiter="; ">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </if>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="song">
-        <choose>
-          <if variable="original-author composer" match="any">
-            <group delimiter="; ">
-              <!-- Replace prefix with performer label as that becomes available -->
-              <names variable="author" prefix="Recorded by ">
-                <label form="verb" text-case="title"/>
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-              </names>
-              <names variable="translator">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </group>
-          </if>
-        </choose>
-      </else-if>
-      <else-if type="article-journal article-magazine article-newspaper" match="any">
-        <group delimiter="; ">
-          <choose>
-            <if variable="title">
-              <names variable="interviewer" delimiter="; ">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </if>
-          </choose>
-          <names variable="translator" delimiter="; ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-        </group>
-      </else-if>
-      <else-if type="paper-conference">
-        <choose>
-          <if variable="collection-editor editor" match="any">
-            <text macro="secondary-contributors-booklike"/>
-          </if>
-          <else>
-            <group delimiter="; ">
-              <choose>
-                <if variable="title">
-                  <names variable="interviewer" delimiter="; ">
-                    <name and="symbol" initialize-with=". " delimiter=", "/>
-                    <label form="short" prefix=", " text-case="title"/>
-                  </names>
-                </if>
-              </choose>
-              <names variable="translator" delimiter="; ">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </group>
-          </else>
-        </choose>
-      </else-if>
-      <else>
-        <group delimiter="; ">
-          <choose>
-            <if variable="title">
-              <names variable="interviewer">
-                <name and="symbol" initialize-with=". " delimiter="; "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </if>
-          </choose>
-          <names variable="editor translator" delimiter="; ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="author">
-    <choose>
-      <if type="song">
-        <names variable="composer" delimiter=", ">
+  <!-- General categories of item types:
+       Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
+       Periodical or Booklike: paper-conference
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+                 personal_communication report song speech thesis post webpage
+       Legal: bill legal_case legislation treaty
+  -->
+  <!-- APA references contain four parts: author, date, title, source -->
+  <macro name="author-bib">
+    <names variable="composer" delimiter=", ">
+      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <substitute>
+        <names variable="author"/>
+        <names variable="illustrator"/>
+        <names variable="director">
           <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-          <substitute>
-            <names variable="original-author"/>
-            <names variable="author"/>
-            <names variable="translator">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <group delimiter=" ">
-              <text macro="title"/>
-              <text macro="description"/>
-              <text macro="format"/>
-            </group>
-          </substitute>
+          <label form="long" prefix=" (" suffix=")" text-case="title"/>
         </names>
-      </if>
-      <else-if type="treaty"/>
-      <else>
-        <names variable="author" delimiter=", ">
-          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-          <substitute>
-            <names variable="illustrator"/>
-            <names variable="composer"/>
-            <names variable="director">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="long" prefix=" (" suffix=")" text-case="title"/>
-            </names>
+        <choose>
+          <if variable="container-title">
             <choose>
-              <if variable="container-title">
+              <if type="book entry entry-dictionary entry-encyclopedia" match="any">
                 <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia">
-                    <text macro="title"/>
+                  <if variable="title">
+                    <group delimiter=" ">
+                      <text macro="title"/>
+                      <text macro="parenthetical"/>
+                    </group>
                   </if>
                   <else>
-                    <names variable="translator"/>
+                    <text macro="title-and-descriptions"/>
                   </else>
                 </choose>
-                <names variable="translator">
-                  <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-                  <label form="short" prefix=" (" suffix=")" text-case="title"/>
-                </names>
-              </if>
-            </choose>
-            <names variable="editor translator" delimiter=", ">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <names variable="editorial-director">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <names variable="collection-editor">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <choose>
-              <if type="report">
-                <text variable="publisher"/>
               </if>
             </choose>
+          </if>
+        </choose>
+        <!-- Test for editortranslator and put that first as that becomes available -->
+        <names variable="editor" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="editorial-director">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="collection-editor">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <choose>
+          <if variable="title">
             <group delimiter=" ">
               <text macro="title"/>
-              <text macro="description"/>
-              <text macro="format"/>
+              <text macro="parenthetical"/>
             </group>
-          </substitute>
-        </names>
-      </else>
-    </choose>
+          </if>
+          <else>
+            <text macro="title-and-descriptions"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
   </macro>
-  <macro name="author-short">
+  <macro name="author-intext">
     <choose>
-      <if type="patent" variable="number" match="all">
-        <text macro="patent-number"/>
+      <if type="bill legal_case legislation treaty" match="any">
+        <text macro="title-intext"/>
       </if>
-      <else-if type="treaty">
-        <text variable="title" form="short"/>
-      </else-if>
-      <else-if type="personal_communication">
+      <else-if type="interview personal_communication">
         <choose>
-          <if variable="archive DOI publisher URL" match="none">
+          <!-- These variables indicate that the letter is retrievable by the reader. 
+                If not, then use the APA in-text-only personal communication format -->
+          <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
               <names variable="author">
                 <name and="symbol" delimiter=", " initialize-with=". "/>
                 <substitute>
-                  <text variable="title" form="short" quotes="true"/>
+                  <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- This should be localized -->
-              <text value="personal communication"/>
+              <!-- Replace with term="personal-communication" if that becomes available -->
+              <text term="letter"/>
             </group>
           </if>
           <else>
             <names variable="author" delimiter=", ">
               <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
               <substitute>
-                <names variable="editor"/>
-                <names variable="translator"/>
-                <choose>
-                  <if variable="container-title">
-                    <text variable="title" form="short" quotes="true"/>
-                  </if>
-                  <else>
-                    <text variable="title" form="short" font-style="italic"/>
-                  </else>
-                </choose>
-                <text macro="format-short" prefix="[" suffix="]"/>
+                <text macro="title-intext"/>
               </substitute>
             </names>
           </else>
         </choose>
       </else-if>
-      <else-if type="song">
+      <else>
         <names variable="composer" delimiter=", ">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
           <substitute>
-            <names variable="original-author"/>
             <names variable="author"/>
-            <names variable="translator"/>
-            <choose>
-              <if variable="container-title">
-                <text variable="title" form="short" quotes="true"/>
-              </if>
-              <else>
-                <text variable="title" form="short" font-style="italic"/>
-              </else>
-            </choose>
-            <text macro="format-short" prefix="[" suffix="]"/>
-          </substitute>
-        </names>
-      </else-if>
-      <else>
-        <names variable="author" delimiter=", ">
-          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
-          <substitute>
             <names variable="illustrator"/>
-            <names variable="composer"/>
             <names variable="director"/>
             <choose>
               <if variable="container-title">
                 <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia">
-                    <text variable="title" form="short" quotes="true"/>
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
+                    <text macro="title-intext"/>
                   </if>
-                  <else>
-                    <names variable="translator"/>
-                  </else>
                 </choose>
               </if>
             </choose>
             <names variable="editor"/>
             <names variable="editorial-director"/>
-            <names variable="translator"/>
-            <choose>
-              <if type="report" variable="publisher" match="all">
-                <text variable="publisher"/>
-              </if>
-              <else-if type="legal_case">
-                <text variable="title" font-style="italic"/>
-              </else-if>
-              <else-if type="bill legislation" match="any">
-                <text variable="title" form="short"/>
-              </else-if>
-              <else-if variable="reviewed-author" type="review review-book" match="any">
-                <text macro="format-short" prefix="[" suffix="]"/>
-              </else-if>
-              <else-if type="post post-weblog webpage" variable="container-title" match="any">
-                <text variable="title" form="short" quotes="true"/>
-              </else-if>
-              <else>
-                <text variable="title" form="short" font-style="italic"/>
-              </else>
-            </choose>
-            <text macro="format-short" prefix="[" suffix="]"/>
+            <text macro="title-intext"/>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
-  <macro name="patent-number">
-    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
-    <group delimiter=" ">
-      <text variable="authority"/>
+  <macro name="date-bib">
+    <group delimiter=" " prefix="(" suffix=")">
       <choose>
-        <if variable="genre">
-          <text variable="genre" text-case="capitalize-first"/>
+        <if is-uncertain-date="issued">
+          <text term="circa" form="short"/>
         </if>
-        <else>
-          <!-- This should be localized -->
-          <text value="patent" text-case="capitalize-first"/>
-        </else>
       </choose>
-      <group delimiter=" ">
-        <text term="issue" form="short" text-case="capitalize-first"/>
-        <text variable="number"/>
-      </group>
-    </group>
-  </macro>
-  <macro name="access">
-    <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if variable="DOI" match="any">
-        <text variable="DOI" prefix="https://doi.org/"/>
-      </else-if>
-      <else-if variable="URL">
-        <group delimiter=" ">
-          <text term="retrieved" text-case="capitalize-first"/>
-          <choose>
-            <if type="post post-weblog webpage" match="any">
-              <date variable="accessed" form="text" suffix=","/>
-            </if>
-          </choose>
-          <text term="from"/>
-          <choose>
-            <if type="report">
-              <choose>
-                <if variable="author editor translator" match="any">
-                  <!-- This should be localized -->
-                  <text variable="publisher" suffix=" website:"/>
-                </if>
-              </choose>
-            </if>
-            <else-if type="post post-weblog webpage" match="any">
-              <!-- This should be localized -->
-              <text variable="container-title" suffix=" website:"/>
-            </else-if>
-          </choose>
-          <text variable="URL"/>
-        </group>
-      </else-if>
-      <else-if variable="archive">
+      <group>
         <choose>
-          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
-            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
+          <if variable="issued">
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+            <text variable="year-suffix"/>
             <choose>
-              <if variable="archive-place" match="none">
-                <group delimiter=" ">
-                  <text term="retrieved" text-case="capitalize-first"/>
-                  <text term="from"/>
-                  <text variable="archive" suffix="."/>
-                  <text variable="archive_location" prefix="(" suffix=")"/>
-                </group>
+              <if type="article-magazine article-newspaper broadcast interview motion_picture pamphlet personal_communication post post-weblog song speech webpage" match="any">
+                <!-- Many video and audio examples in manual give full dates. Err on the side of too much information. -->
+                <date variable="issued">
+                  <date-part prefix=", " name="month"/>
+                  <date-part prefix=" " name="day"/>
+                </date>
               </if>
-              <else>
-                <text macro="publisher" suffix="."/>
-              </else>
+              <else-if type="paper-conference">
+                <!-- Capture 'speech' stored as 'paper-conference' -->
+                <choose>
+                  <if variable="collection-editor editor editorial-director issue page volume" match="none">
+                    <date variable="issued">
+                      <date-part prefix=", " name="month"/>
+                      <date-part prefix=" " name="day"/>
+                    </date>
+                  </if>
+                </choose>
+              </else-if>
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+                   manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
+          <else-if variable="status">
+            <group>
+              <text variable="status" text-case="lowercase"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
+          </else-if>
           <else>
-            <text macro="publisher" suffix="."/>
+            <group>
+              <text term="no date" form="short"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
           </else>
         </choose>
-      </else-if>
-      <else>
-        <text macro="publisher" suffix="."/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="title">
+      </group>
+    </group>
+  </macro>
+  <macro name="date-sort-group">
     <choose>
-      <if type="treaty">
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
+      <if variable="issued">
+        <text value="1"/>
+      </if>
+      <else-if variable="status">
+        <text value="2"/>
+      </else-if>
+      <else>
+        <text value="0"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-sort-date">
+    <choose>
+      <if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
+        <date variable="issued" form="numeric"/>
+      </if>
+      <else-if type="paper-conference">
+        <!-- Capture 'speech' stored as 'paper-conference' -->
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <date variable="issued" form="numeric"/>
+          </if>
+        </choose>
+      </else-if>
+      <else>
+        <date variable="issued" form="numeric"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-intext">
+    <choose>
+      <if variable="issued">
+        <group delimiter="/">
+          <group delimiter=" ">
+            <choose>
+              <if is-uncertain-date="original-date">
+                <text term="circa" form="short"/>
+              </if>
+            </choose>
+            <date variable="original-date">
+              <date-part name="year"/>
+            </date>
+          </group>
+          <group delimiter=" ">
+            <choose>
+              <if is-uncertain-date="issued">
+                <text term="circa" form="short"/>
+              </if>
+            </choose>
+            <group>
+              <choose>
+                <if type="interview personal_communication">
+                  <choose>
+                    <if variable="archive container-title DOI publisher URL" match="none">
+                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                           If not, then use the in-text-only personal communication format -->
+                      <date variable="issued" form="text"/>
+                    </if>
+                    <else>
+                      <date variable="issued">
+                        <date-part name="year"/>
+                      </date>
+                    </else>
+                  </choose>
+                </if>
+                <else>
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                </else>
+              </choose>
+              <text variable="year-suffix"/>
+            </group>
+          </group>
         </group>
       </if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
+      <else-if variable="status">
+        <text variable="status" text-case="lowercase"/>
+        <text variable="year-suffix" prefix="-"/>
       </else-if>
-      <else-if variable="title">
+      <else>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- APA has two description elements following the title:
+       title (parenthetical) [bracketed]  -->
+  <macro name="title-and-descriptions">
+    <choose>
+      <if variable="title">
+        <group delimiter=" ">
+          <text macro="title"/>
+          <text macro="parenthetical"/>
+          <text macro="bracketed"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <text macro="bracketed"/>
+          <text macro="parenthetical"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="post webpage" match="any">
+        <!-- Webpages are always italicized -->
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else-if variable="container-title" match="any">
+        <!-- Other types are italicized based on presence of container-title.
+             Assume that review and review-book are published in periodicals/blogs,
+             not just on a web page (ex. 69) -->
+        <text variable="title"/>
+      </else-if>
+      <else>
         <choose>
-          <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a software type -->
-            <text variable="title"/>
+          <if type="article-journal article-magazine article-newspaper post-weblog review review-book">
+            <text variable="title" font-style="italic"/>
           </if>
-          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <else-if type="paper-conference">
             <choose>
-              <if variable="reviewed-title">
-                <choose>
-                  <if type="post post-weblog webpage" variable="container-title" match="any">
-                    <text variable="title"/>
-                  </if>
-                  <else>
-                    <text variable="title" font-style="italic"/>
-                  </else>
-                </choose>
+              <if variable="collection-editor editor editorial-director" match="any">
+                <group delimiter=": " font-style="italic">
+                  <text variable="title"/>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <label variable="volume" form="short" text-case="capitalize-first"/>
+                        <text variable="volume"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
               </if>
+              <else>
+                <text variable="title" font-style="italic"/>
+              </else>
             </choose>
           </else-if>
-          <else-if type="post post-weblog webpage" variable="container-title" match="any">
-            <text variable="title"/>
+          <else>
+            <group delimiter=": " font-style="italic">
+              <text variable="title"/>
+              <!-- Replace with volume-title as that becomes available -->
+              <choose>
+                <if is-numeric="volume" match="none">
+                  <group delimiter=" ">
+                    <label variable="volume" form="short" text-case="capitalize-first"/>
+                    <text variable="volume"/>
+                  </group>
+                </if>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-intext">
+    <choose>
+      <if variable="title" match="none">
+        <text macro="bracketed-intext" prefix="[" suffix="]"/>
+      </if>
+      <else-if type="bill">
+        <!-- If a bill has no number or container-title, assume it is a hearing; italic and title case -->
+        <choose>
+          <if variable="number container-title" match="none">
+            <text variable="title" form="short" font-style="italic" text-case="title"/>
+          </if>
+          <else-if variable="title">
+            <text variable="title" form="short"/>
           </else-if>
           <else>
-            <text variable="title" font-style="italic"/>
+            <group delimiter=" ">
+              <text variable="genre"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="chapter-number container-title" match="none">
+                    <!-- Replace with label variable="number" as that becomes available -->
+                    <text term="issue" form="short"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </group>
           </else>
         </choose>
       </else-if>
-      <else-if variable="interviewer" type="interview" match="any">
-        <names variable="interviewer">
-          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
-          <name and="symbol" initialize-with=". " delimiter=", "/>
-        </names>
+      <else-if type="legal_case" match="any">
+        <!-- Cases are italicized -->
+        <text variable="title" font-style="italic"/>
       </else-if>
+      <else-if type="legislation treaty" match="any">
+        <!-- Legislation and treaties not italicized or quoted -->
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="post webpage" match="any">
+        <!-- Webpages are always italicized -->
+        <text variable="title" form="short" font-style="italic"/>
+      </else-if>
+      <else-if variable="container-title" match="any">
+        <!-- Other types are italicized or quoted based on presence of container-title. As in title macro. -->
+        <text variable="title" form="short" quotes="true"/>
+      </else-if>
+      <else>
+        <text variable="title" form="short" font-style="italic"/>
+      </else>
     </choose>
   </macro>
-  <!-- APA has four descriptive sections following the title: -->
-  <!-- (description), [format], container, event -->
-  <macro name="description">
+  <macro name="parenthetical">
+    <!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->
     <group prefix="(" suffix=")">
       <choose>
-        <!-- book is here to catch software with container titles -->
-        <if type="book report" match="any">
+        <if type="patent">
+          <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
+          <group delimiter=" ">
+            <text variable="authority" form="short"/>
+            <choose>
+              <if variable="genre">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <text value="patent" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <group delimiter=" ">
+              <!-- Replace with label variable="number" if that becomes available -->
+              <text term="issue" form="short" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </group>
+        </if>
+        <else-if type="post webpage">
+          <!-- For post webpage, container-title is treated as publisher -->
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <text macro="database-location"/>
+            <text macro="number"/>
+            <text macro="locators-booklike"/>
+          </group>
+        </else-if>
+        <else-if variable="container-title">
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <choose>
+              <if type="broadcast graphic map motion_picture song" match="any">
+                <!-- For audiovisual media, number information comes after title, not container-title -->
+                <text macro="number"/>
+              </if>
+            </choose>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <text macro="database-location"/>
+            <text macro="number"/>
+            <text macro="locators-booklike"/>
+          </group>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="parenthetical-container">
+    <choose>
+      <if variable="container-title" match="any">
+        <group prefix="(" suffix=")">
+          <group delimiter="; ">
+            <text macro="database-location"/>
+            <choose>
+              <if type="broadcast graphic map motion_picture song" match="none">
+                <!-- For audiovisual media, number information comes after title, not container-title -->
+                <text macro="number"/>
+              </if>
+            </choose>
+            <text macro="locators-booklike"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="bracketed">
+    <!-- [Descriptive information] -->
+    <!-- If there is a number, genre is already printed in macro="number" -->
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <!-- Reviewed item -->
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <!-- Assume that genre is entered as 'Review of the book' or similar -->
+                <choose>
+                  <if variable="number" match="none">
+                    <choose>
+                      <if variable="genre">
+                        <text variable="genre" text-case="capitalize-first"/>
+                      </if>
+                      <else-if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </else-if>
+                      <else>
+                        <!-- Replace with term="review" as that becomes available -->
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </if>
+                  <else>
+                    <choose>
+                      <if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                      <else>
+                        <!-- Replace with term="review" as that becomes available -->
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </else>
+                </choose>
+                <text macro="reviewed-title"/>
+              </group>
+              <names variable="reviewed-author">
+                <label form="verb-short" suffix=" "/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+            </group>
+            <choose>
+              <if variable="genre" match="any">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </group>
+        </if>
+        <else-if type="thesis">
+          <!-- Thesis type and institution -->
+          <group delimiter="; ">
+            <choose>
+              <if variable="number" match="none">
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="archive DOI URL" match="any">
+                      <!-- Include the university in brackets if thesis is published -->
+                      <text variable="publisher"/>
+                    </if>
+                  </choose>
+                </group>
+              </if>
+            </choose>
+            <text variable="medium" text-case="capitalize-first"/>
+          </group>
+        </else-if>
+        <else-if variable="interviewer" type="interview" match="any">
+          <!-- Interview information -->
           <choose>
-            <if variable="container-title">
-              <text macro="secondary-contributors"/>
+            <if variable="title">
+              <text macro="format"/>
             </if>
+            <else-if variable="genre">
+              <group delimiter="; ">
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <group delimiter=" ">
+                    <text term="author" form="verb"/>
+                    <names variable="interviewer">
+                      <name and="symbol" initialize-with=". " delimiter=", "/>
+                    </names>
+                  </group>
+                </group>
+              </group>
+            </else-if>
+            <else-if variable="interviewer">
+              <group delimiter="; ">
+                <names variable="interviewer">
+                  <label form="verb" suffix=" " text-case="capitalize-first"/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                </names>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </else-if>
             <else>
+              <text macro="format"/>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="personal_communication">
+          <!-- Letter information -->
+          <choose>
+            <if variable="recipient">
               <group delimiter="; ">
-                <text macro="description-report"/>
-                <text macro="secondary-contributors"/>
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="number" match="none">
+                      <choose>
+                        <if variable="genre">
+                          <text variable="genre" text-case="capitalize-first"/>
+                        </if>
+                        <else-if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </else-if>
+                        <else>
+                          <text term="letter" form="short" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </if>
+                    <else>
+                      <choose>
+                        <if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </if>
+                        <else>
+                          <text term="letter" form="short" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </else>
+                  </choose>
+                  <names variable="recipient" delimiter=", ">
+                    <label form="verb" suffix=" "/>
+                    <name and="symbol" delimiter=", "/>
+                  </names>
+                </group>
+                <choose>
+                  <if variable="genre" match="any">
+                    <choose>
+                      <if variable="number" match="none">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                    </choose>
+                  </if>
+                </choose>
               </group>
+            </if>
+            <else>
+              <text macro="format"/>
             </else>
           </choose>
-        </if>
-        <else-if type="thesis">
-          <group delimiter="; ">
-            <group delimiter=", ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <choose>
-                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
-                <if variable="DOI URL archive" match="any">
-                  <text variable="publisher"/>
-                </if>
-              </choose>
-            </group>
-            <text macro="locators"/>
-            <text macro="secondary-contributors"/>
-          </group>
         </else-if>
-        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+        <else-if variable="composer" type="song" match="all">
+          <!-- Performer of classical music works -->
           <group delimiter="; ">
-            <text macro="locators"/>
-            <text macro="secondary-contributors"/>
+            <choose>
+              <if variable="number" match="none">
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="genre">
+                      <text variable="genre" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </if>
+                    <else-if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else-if>
+                    <else>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </if>
+                    <else>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <choose>
+              <if variable="genre" match="any">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
           </group>
         </else-if>
-        <else-if type="song">
+        <else-if variable="container-title" match="none">
+          <!-- Other description -->
+          <text macro="format"/>
+        </else-if>
+        <else>
+          <!-- For conference presentations, chapters in reports, software, place bracketed after the container title -->
           <choose>
-            <if variable="container-title" match="none">
-              <text macro="locators"/>
+            <if type="paper-conference speech" match="any">
+              <choose>
+                <if variable="collection-editor editor editorial-director issue page volume" match="any">
+                  <text macro="format"/>
+                </if>
+              </choose>
             </if>
+            <else-if type="book">
+              <choose>
+                <if variable="version" match="none">
+                  <text macro="format"/>
+                </if>
+              </choose>
+            </else-if>
+            <else-if type="report" match="none">
+              <text macro="format"/>
+            </else-if>
           </choose>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="bracketed-intext">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <!-- This should be localized -->
+          <text macro="reviewed-title-intext" prefix="Review of "/>
+        </if>
+        <else-if variable="interviewer" type="interview" match="any">
+          <names variable="interviewer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <substitute>
+              <text macro="format-intext"/>
+            </substitute>
+          </names>
         </else-if>
-        <else-if type="article dataset figure" match="any">
+        <else-if type="personal_communication">
+          <!-- Letter information -->
           <choose>
-            <if variable="container-title">
-              <text macro="secondary-contributors"/>
+            <if variable="recipient">
+              <group delimiter=" ">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="genre" text-case="capitalize-first"/>
+                  </if>
+                  <else>
+                    <text term="letter" form="short" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <names variable="recipient" delimiter=", ">
+                  <label form="verb" suffix=" "/>
+                  <name and="symbol" delimiter=", "/>
+                </names>
+              </group>
             </if>
             <else>
-              <group delimiter="; ">
-                <text macro="locators"/>
-                <text macro="secondary-contributors"/>
-              </group>
+              <text macro="format-intext"/>
             </else>
           </choose>
         </else-if>
-        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
-          <text macro="secondary-contributors"/>
-        </else-if>
+        <else>
+          <text macro="format-intext"/>
+        </else>
       </choose>
     </group>
   </macro>
-  <macro name="format">
+  <macro name="bracketed-container">
     <group prefix="[" suffix="]">
       <choose>
-        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <group delimiter=", ">
-            <choose>
-              <if variable="genre">
-                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
-                <group delimiter=", ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <choose>
-                    <if variable="reviewed-title">
-                      <text variable="reviewed-title" font-style="italic"/>
-                    </if>
-                    <else>
-                      <!-- Assume `title` is title of reviewed work -->
-                      <text variable="title" font-style="italic"/>
-                    </else>
-                  </choose>
-                </group>
-              </if>
-              <else>
-                <!-- This should be localized -->
-                <group delimiter=" ">
-                  <text value="Review of"/>
-                  <choose>
-                    <if variable="reviewed-title">
-                      <text variable="reviewed-title" font-style="italic"/>
-                    </if>
-                    <else>
-                      <!-- Assume `title` is title of reviewed work -->
-                      <text variable="title" font-style="italic"/>
-                    </else>
-                  </choose>
-                </group>
-              </else>
-            </choose>
-            <names variable="reviewed-author">
-              <label form="verb-short" suffix=" "/>
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-            </names>
-          </group>
+        <if type="paper-conference speech" match="any">
+          <!-- Conference presentations should describe the session [container] in bracketed unless published in a proceedings -->
+          <choose>
+            <if variable="collection-editor editor editorial-director issue page volume" match="none">
+              <text macro="format"/>
+            </if>
+          </choose>
         </if>
-        <else>
-          <text macro="format-short"/>
-        </else>
+        <else-if type="book" variable="version" match="all">
+          <!-- For entries in mobile app reference works, place bracketed after the container-title -->
+          <text macro="format"/>
+        </else-if>
+        <else-if type="report">
+          <!-- For chapters in reports, place bracketed after the container title -->
+          <text macro="format"/>
+        </else-if>
       </choose>
     </group>
   </macro>
-  <macro name="format-short">
+  <macro name="secondary-contributors">
     <choose>
-      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <text macro="secondary-contributors-periodical"/>
+      </if>
+      <else-if type="paper-conference">
         <choose>
-          <if variable="reviewed-title" match="none">
-            <choose>
-              <if variable="genre">
-                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
-                <group delimiter=", ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text variable="title" form="short" font-style="italic"/>
-                </group>
-              </if>
-              <else>
-                <!-- This should be localized -->
-                <group delimiter=" ">
-                  <text value="Review of"/>
-                  <text variable="title" form="short" font-style="italic"/>
-                </group>
-              </else>
-            </choose>
+          <if variable="collection-editor editor editorial-director" match="any">
+            <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
-            <text variable="title" form="short" quotes="true"/>
+            <text macro="secondary-contributors-periodical"/>
           </else>
         </choose>
-      </if>
-      <else-if type="speech thesis" match="any">
-        <text variable="medium" text-case="capitalize-first"/>
-      </else-if>
-      <!-- book is here to catch software with container titles -->
-      <else-if type="book report" match="any">
-        <choose>
-          <if variable="container-title" match="none">
-            <text macro="format-report"/>
-          </if>
-        </choose>
-      </else-if>
-      <else-if type="manuscript pamphlet" match="any">
-        <text variable="medium" text-case="capitalize-first"/>
       </else-if>
-      <else-if type="personal_communication">
-        <text macro="secondary-contributors"/>
-      </else-if>
-      <else-if type="song">
-        <group delimiter="; ">
-          <text macro="secondary-contributors"/>
+      <else>
+        <text macro="secondary-contributors-booklike"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-periodical">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <names variable="translator" delimiter="; ">
+        <name and="symbol" initialize-with=". " delimiter=", "/>
+        <label form="short" prefix=", " text-case="title"/>
+      </names>
+    </group>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <!-- When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
+      <choose>
+        <if type="post webpage" match="none">
+          <!-- Webpages treat container-title like publisher -->
           <choose>
             <if variable="container-title" match="none">
-              <group delimiter=", ">
-                <text variable="genre" text-case="capitalize-first"/>
-                <text variable="medium" text-case="capitalize-first"/>
+              <group delimiter="; ">
+                <names variable="container-author">
+                  <label form="verb-short" suffix=" " text-case="title"/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                </names>
+                <names variable="editor translator" delimiter="; ">
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                  <label form="short" prefix=", " text-case="title"/>
+                </names>
               </group>
             </if>
           </choose>
-        </group>
-      </else-if>
-      <else-if type="paper-conference">
-        <group delimiter=", ">
-          <choose>
-            <if variable="collection-editor editor issue page volume" match="any">
-              <text variable="genre" text-case="capitalize-first"/>
-            </if>
-          </choose>
-          <text variable="medium" text-case="capitalize-first"/>
-        </group>
-      </else-if>
-      <else-if type="bill legislation legal_case patent treaty" match="none">
-        <choose>
-          <if variable="genre medium" match="any">
-            <group delimiter=", ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <text variable="medium" text-case="capitalize-first"/>
-            </group>
-          </if>
-          <else-if type="dataset">
-            <!-- This should be localized -->
-            <text value="Data set"/>
-          </else-if>
-        </choose>
-      </else-if>
-    </choose>
+        </if>
+        <else>
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </else>
+      </choose>
+    </group>
   </macro>
-  <macro name="description-report">
+  <macro name="database-location">
     <choose>
-      <if variable="number">
-        <group delimiter="; ">
-          <group delimiter=" ">
-            <text variable="genre" text-case="title"/>
-            <!-- Replace with term="number" if that becomes available -->
-            <text term="issue" form="short" text-case="capitalize-first"/>
-            <text variable="number"/>
-          </group>
-          <text macro="locators"/>
-        </group>
+      <if variable="archive-place" match="none">
+        <!-- With `archive-place`: physical archives. Without: online archives. -->
+        <!-- Add archive_collection as that becomes available -->
+        <text variable="archive_location"/>
       </if>
-      <else>
-        <text macro="locators"/>
-      </else>
     </choose>
   </macro>
-  <macro name="format-report">
+  <macro name="number">
     <choose>
       <if variable="number">
-        <text variable="medium" text-case="capitalize-first"/>
-      </if>
-      <else>
         <group delimiter=", ">
-          <text variable="genre" text-case="capitalize-first"/>
-          <text variable="medium" text-case="capitalize-first"/>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="archive">
-    <group delimiter=". ">
-      <group delimiter=", ">
-        <choose>
-          <if type="manuscript">
-            <text variable="genre"/>
-          </if>
-        </choose>
-        <group delimiter=" ">
-          <!-- Replace "archive" with "archive_collection" as that becomes available -->
-          <text variable="archive"/>
-          <text variable="archive_location" prefix="(" suffix=")"/>
-        </group>
-      </group>
-      <group delimiter=", ">
-        <!-- Move "archive" here when "archive_collection" becomes available -->
-        <text variable="archive-place"/>
-      </group>
-    </group>
-  </macro>
-  <macro name="publisher">
-    <choose>
-      <if type="manuscript pamphlet" match="any">
-        <choose>
-          <if variable="archive archive_location archive-place" match="any">
-            <group delimiter=". ">
-              <group delimiter=": ">
-                <text variable="publisher-place"/>
-                <text variable="publisher"/>
-              </group>
-              <text macro="archive"/>
-            </group>
-          </if>
-          <else>
-            <group delimiter=", ">
-              <text variable="genre"/>
-              <text variable="publisher"/>
-              <text variable="publisher-place"/>
-            </group>
-          </else>
-        </choose>
-      </if>
-      <else-if type="thesis" match="any">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="publisher"/>
-            <text variable="publisher-place"/>
-          </group>
-          <text macro="archive"/>
-        </group>
-      </else-if>
-      <else-if type="patent">
-        <group delimiter=". ">
-          <group delimiter=": ">
-            <text variable="publisher-place"/>
-            <text variable="publisher"/>
+          <group delimiter=" ">
+            <text variable="genre" text-case="title"/>
+            <choose>
+              <if is-numeric="number">
+                <!-- Replace with label variable="number" if that becomes available -->
+                <text term="issue" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </if>
+              <else>
+                <text variable="number"/>
+              </else>
+            </choose>
           </group>
-          <text macro="archive"/>
-        </group>
-      </else-if>
-      <else-if type="article-journal article-magazine article-newspaper" match="any">
-        <text macro="archive"/>
-      </else-if>
-      <else-if type="post post-weblog webpage" match="none">
-        <group delimiter=". ">
           <choose>
-            <if variable="event">
+            <if type="thesis">
               <choose>
-                <!-- Only print publisher info if published in a proceedings -->
-                <if variable="collection-editor editor issue page volume" match="any">
-                  <group delimiter=": ">
-                    <text variable="publisher-place"/>
-                    <text variable="publisher"/>
-                  </group>
+                <!-- Include the university in brackets if thesis is published -->
+                <if variable="archive DOI URL" match="any">
+                  <text variable="publisher"/>
                 </if>
               </choose>
             </if>
-            <else>
-              <group delimiter=": ">
-                <text variable="publisher-place"/>
-                <text variable="publisher"/>
-              </group>
-            </else>
           </choose>
-          <text macro="archive"/>
         </group>
-      </else-if>
+      </if>
     </choose>
   </macro>
-  <macro name="event">
+  <macro name="locators-booklike">
     <choose>
-      <if variable="event" type="speech paper-conference" match="any">
+      <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>
+      <else-if type="paper-conference">
         <choose>
-          <!-- Don't print event info if published in a proceedings -->
-          <if variable="collection-editor editor issue page volume" match="none">
-            <group delimiter=" ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <group delimiter=" ">
-                <choose>
-                  <if variable="genre">
-                    <text term="presented at"/>
-                  </if>
-                  <else>
-                    <text term="presented at" text-case="capitalize-first"/>
-                  </else>
-                </choose>
-                <group delimiter=", ">
-                  <text variable="event"/>
-                  <text variable="event-place"/>
-                </group>
-              </group>
+          <if variable="collection-editor editor editorial-director" match="any">
+            <group delimiter=", ">
+              <text macro="version"/>
+              <text macro="edition"/>
+              <text macro="volume-booklike"/>
             </group>
           </if>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="issued">
-    <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if variable="issued">
-        <group>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
-          <text variable="year-suffix"/>
-          <choose>
-            <if type="speech">
-              <date variable="issued" delimiter=" ">
-                <date-part prefix=", " name="month"/>
-              </date>
-            </if>
-            <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
-              <date variable="issued">
-                <date-part prefix=", " name="month"/>
-                <date-part prefix=" " name="day"/>
-              </date>
-            </else-if>
-            <else-if type="paper-conference">
-              <choose>
-                <if variable="container-title" match="none">
-                  <date variable="issued">
-                    <date-part prefix=", " name="month"/>
-                    <date-part prefix=" " name="day"/>
-                  </date>
-                </if>
-              </choose>
-            </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
-          </choose>
-        </group>
-      </else-if>
-      <else-if variable="status">
-        <group>
-          <text variable="status" text-case="lowercase"/>
-          <text variable="year-suffix" prefix="-"/>
-        </group>
+        </choose>
       </else-if>
       <else>
-        <group>
-          <text term="no date" form="short"/>
-          <text variable="year-suffix" prefix="-"/>
+        <group delimiter=", ">
+          <text macro="version"/>
+          <text macro="edition"/>
+          <text macro="volume-booklike"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="version">
+    <choose>
+      <if is-numeric="version">
+        <group delimiter=" ">
+          <!-- replace with label variable="version" if that becomes available -->
+          <text term="version" text-case="capitalize-first"/>
+          <text variable="version"/>
         </group>
+      </if>
+      <else>
+        <text variable="version"/>
       </else>
     </choose>
   </macro>
-  <macro name="issued-sort">
+  <macro name="edition">
     <choose>
-      <if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
-        <date variable="issued">
-          <date-part name="year"/>
-          <date-part name="month"/>
-          <date-part name="day"/>
-        </date>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <label variable="edition" form="short"/>
+        </group>
       </if>
       <else>
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
-  <macro name="issued-year">
-    <group>
+  <macro name="volume-booklike">
+    <group delimiter=", ">
+      <!-- Report series [ex. 52] -->
+      <choose>
+        <if type="report">
+          <group delimiter=" ">
+            <text variable="collection-title" text-case="title"/>
+            <text variable="collection-number"/>
+          </group>
+        </if>
+      </choose>
       <choose>
-        <if type="personal_communication">
+        <if variable="volume" match="any">
           <choose>
-            <if variable="archive DOI publisher URL" match="none">
-              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
-              <date variable="issued" form="text"/>
-            </if>
+            <!-- Non-numeric volumes are already printed as part of the book title -->
+            <if is-numeric="volume" match="none"/>
             <else>
-              <date variable="issued">
-                <date-part name="year"/>
-              </date>
+              <group delimiter=" ">
+                <label variable="volume" form="short" text-case="capitalize-first"/>
+                <number variable="volume" form="numeric"/>
+              </group>
             </else>
           </choose>
         </if>
         <else>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <group>
+            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <text term="page-range-delimiter" prefix="1"/>
+            <number variable="number-of-volumes" form="numeric"/>
+          </group>
         </else>
       </choose>
-      <text variable="year-suffix"/>
+      <group delimiter=" ">
+        <label variable="issue" text-case="capitalize-first"/>
+        <text variable="issue"/>
+      </group>
+      <group delimiter=" ">
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
     </group>
   </macro>
-  <macro name="issued-citation">
+  <macro name="reviewed-title">
     <choose>
-      <if variable="issued">
-        <group delimiter="/">
-          <choose>
-            <if is-uncertain-date="original-date">
-              <group prefix="[" suffix="]" delimiter=" ">
-                <text term="circa" form="short"/>
-                <date variable="original-date">
-                  <date-part name="year"/>
-                </date>
-              </group>
-            </if>
-            <else>
-              <date variable="original-date">
-                <date-part name="year"/>
-              </date>
-            </else>
-          </choose>
-          <choose>
-            <if is-uncertain-date="issued">
-              <group prefix="[" suffix="]" delimiter=" ">
-                <text term="circa" form="short"/>
-                <text macro="issued-year"/>
-              </group>
-            </if>
-            <else>
-              <text macro="issued-year"/>
-            </else>
-          </choose>
-        </group>
+      <if variable="reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed 
+              works [Ex. 69] -->
+        <text variable="reviewed-title" font-style="italic"/>
       </if>
-      <else-if variable="status">
-        <text variable="status" text-case="lowercase"/>
-        <text variable="year-suffix" prefix="-"/>
-      </else-if>
       <else>
-        <text term="no date" form="short"/>
-        <text variable="year-suffix" prefix="-"/>
+        <!-- Assume title is title of reviewed work -->
+        <text variable="title" font-style="italic"/>
       </else>
     </choose>
   </macro>
-  <macro name="original-date">
+  <macro name="reviewed-title-intext">
     <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech">
-        <date variable="original-date" delimiter=" ">
-          <date-part name="month"/>
-          <date-part name="year"/>
-        </date>
-      </else-if>
-      <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
-        <date variable="original-date" form="text"/>
-      </else-if>
+      <if variable="reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed works [Ex. 69] -->
+        <text variable="reviewed-title" form="short" font-style="italic"/>
+      </if>
       <else>
-        <date variable="original-date">
-          <date-part name="year"/>
-        </date>
+        <!-- Assume title is title of reviewed work -->
+        <text variable="title" form="short" font-style="italic"/>
       </else>
     </choose>
   </macro>
-  <macro name="original-published">
-    <!--This should be localized -->
+  <macro name="format">
     <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if type="interview motion_picture song" match="any">
-        <text value="Original work recorded"/>
+      <if variable="genre medium" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="number" match="none">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </if>
+      <!-- Generic labels for specific types -->
+      <!-- These should be localized when possible -->
+      <else-if type="dataset">
+        <text value="Data set"/>
       </else-if>
-      <else-if type="broadcast">
-        <text value="Original work broadcast"/>
+      <else-if type="book" variable="version" match="all">
+        <!-- Replace with type="software" and term="software" as that becomes available -->
+        <text value="Computer software"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="letter" text-case="capitalize-first"/>
+          </if>
+          <else-if type="interview">
+            <text term="interview" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="map">
+        <text value="Map"/>
       </else-if>
-      <else>
-        <text value="Original work published"/>
-      </else>
     </choose>
   </macro>
-  <macro name="edition">
+  <macro name="format-intext">
     <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short"/>
-        </group>
+      <if variable="genre" match="any">
+        <text variable="genre" text-case="capitalize-first"/>
       </if>
-      <else>
-        <text variable="edition"/>
-      </else>
+      <else-if variable="medium">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <!-- Generic labels for specific types -->
+      <!-- These should be localized when possible -->
+      <else-if type="dataset">
+        <text value="Data set"/>
+      </else-if>
+      <else-if type="book" variable="version" match="all">
+        <!-- Replace with type="software" and term="software" as that becomes available -->
+        <text value="Computer software"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="letter" text-case="capitalize-first"/>
+          </if>
+          <else-if type="interview">
+            <text term="interview" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="map">
+        <text value="Map"/>
+      </else-if>
     </choose>
   </macro>
-  <macro name="locators">
+  <!-- APA 'source' element contains four parts:
+       container, event, publisher, access -->
+  <macro name="container">
     <choose>
-      <if type="article-journal article-magazine figure review review-book" match="any">
-        <group delimiter=", ">
-          <group>
-            <text variable="volume" font-style="italic"/>
-            <text variable="issue" prefix="(" suffix=")"/>
-          </group>
-          <text variable="page"/>
-        </group>
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <!-- Periodical items -->
+        <text macro="container-periodical"/>
       </if>
-      <else-if type="article-newspaper">
-        <group delimiter=" ">
-          <label variable="page" form="short"/>
-          <text variable="page"/>
-        </group>
-      </else-if>
       <else-if type="paper-conference">
+        <!-- Determine if paper-conference is a periodical or booklike -->
         <choose>
-          <if variable="collection-editor editor" match="any">
-            <text macro="locators-booklike"/>
+          <if variable="editor editorial-director collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
           </if>
           <else>
-            <group delimiter=", ">
-              <group>
-                <text variable="volume" font-style="italic"/>
-                <text variable="issue" prefix="(" suffix=")"/>
-              </group>
-              <text variable="page"/>
-            </group>
+            <text macro="container-periodical"/>
           </else>
         </choose>
       </else-if>
-      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
-        <text macro="locators-booklike"/>
+      <else-if type="post webpage" match="none">
+        <!-- post and webpage treat container-title like publisher -->
+        <text macro="container-booklike"/>
       </else-if>
     </choose>
   </macro>
-  <macro name="locators-booklike">
-    <group delimiter=", ">
-      <text macro="edition"/>
-      <group delimiter=" ">
-        <text term="version" text-case="capitalize-first"/>
-        <text variable="version"/>
+  <macro name="container-periodical">
+    <group delimiter=". ">
+      <group delimiter=", ">
+        <text variable="container-title" font-style="italic" text-case="title"/>
+        <choose>
+          <if variable="volume">
+            <group>
+              <text variable="volume" font-style="italic"/>
+              <text variable="issue" prefix="(" suffix=")"/>
+            </group>
+          </if>
+          <else>
+            <text variable="issue" font-style="italic"/>
+          </else>
+        </choose>
+        <choose>
+          <if variable="page">
+            <text variable="page"/>
+          </if>
+          <else>
+            <!-- Ex. 6: Journal article with article number or eLocator -->
+            <!-- This should be localized -->
+            <text variable="number" prefix="Article "/>
+          </else>
+        </choose>
       </group>
       <choose>
-        <if variable="volume" match="any">
+        <if variable="issued">
           <choose>
-            <if is-numeric="volume" match="none"/>
-            <else-if variable="collection-title">
-              <choose>
-                <if variable="editor translator" match="none">
-                  <choose>
-                    <if variable="collection-number">
-                      <group>
-                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                        <number variable="volume" form="numeric"/>
-                      </group>
-                    </if>
-                  </choose>
-                </if>
-              </choose>
-            </else-if>
-            <else>
-              <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
-              </group>
-            </else>
+            <if variable="issue page volume" match="none">
+              <text variable="status" text-case="capitalize-first"/>
+            </if>
           </choose>
         </if>
-        <else>
-          <group>
-            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
-          </group>
-        </else>
-      </choose>
-      <group>
-        <label variable="page" form="short" suffix=" "/>
-        <text variable="page"/>
-      </group>
-    </group>
-  </macro>
-  <macro name="citation-locator">
-    <group>
-      <choose>
-        <if locator="chapter">
-          <label variable="locator" text-case="capitalize-first"/>
-        </if>
-        <else>
-          <label variable="locator" form="short"/>
-        </else>
       </choose>
-      <text variable="locator" prefix=" "/>
     </group>
   </macro>
-  <macro name="container">
+  <macro name="container-booklike">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
-        <group delimiter=", ">
-          <text macro="container-title"/>
-          <text macro="locators"/>
-        </group>
-        <choose>
-          <!--for advance online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
-      </if>
-      <else-if type="article dataset figure" match="any">
-        <choose>
-          <if variable="container-title">
-            <group delimiter=", ">
-              <text macro="container-title"/>
-              <text macro="locators"/>
-            </group>
-            <choose>
-              <!--for advance online publication-->
-              <if variable="issued">
-                <choose>
-                  <if variable="page issue" match="none">
-                    <text variable="status" text-case="capitalize-first" prefix=". "/>
-                  </if>
-                </choose>
-              </if>
-            </choose>
-          </if>
-        </choose>
-      </else-if>
-      <!-- book is here to catch software with container titles -->
-      <else-if type="book" variable="container-title" match="all">
+      <if variable="container-title" match="any">
         <group delimiter=" ">
-          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <text term="in" text-case="capitalize-first"/>
           <group delimiter=", ">
-            <text macro="container-contributors"/>
-            <group delimiter=" ">
-              <text macro="container-title"/>
-              <text macro="description-report" prefix="(" suffix=")"/>
-              <text macro="format-report" prefix="[" suffix="]"/>
+            <names variable="editor translator" delimiter=", &amp; ">
+              <!-- Change to editortranslator and move editor to substitute as that becomes available -->
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" text-case="title" prefix=" (" suffix=")"/>
+              <substitute>
+                <names variable="editorial-director"/>
+                <names variable="collection-editor"/>
+                <names variable="container-author"/>
+              </substitute>
+            </names>
+            <group delimiter=": " font-style="italic">
+              <text variable="container-title"/>
+              <!-- Replace with volume-title as that becomes available -->
+              <choose>
+                <if is-numeric="volume" match="none">
+                  <group delimiter=" ">
+                    <label variable="volume" form="short" text-case="capitalize-first"/>
+                    <text variable="volume"/>
+                  </group>
+                </if>
+              </choose>
             </group>
           </group>
+          <text macro="parenthetical-container"/>
+          <text macro="bracketed-container"/>
         </group>
-      </else-if>
-      <else-if type="report" variable="container-title" match="all">
-        <group delimiter=" ">
-          <text term="in" text-case="capitalize-first" suffix=" "/>
-          <group delimiter=", ">
-            <text macro="container-contributors"/>
-            <group delimiter=" ">
-              <text macro="container-title"/>
-              <text macro="description-report" prefix="(" suffix=")"/>
-              <text macro="format-report" prefix="[" suffix="]"/>
-            </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <choose>
+        <if type="thesis">
+          <choose>
+            <if variable="archive DOI URL" match="none">
+              <text variable="publisher"/>
+            </if>
+          </choose>
+        </if>
+        <else-if type="post webpage">
+          <!-- For websites, treat container title like publisher -->
+          <group delimiter="; ">
+            <text variable="container-title" text-case="title"/>
+            <text variable="publisher"/>
           </group>
-        </group>
-      </else-if>
-      <else-if type="song" variable="container-title" match="all">
+        </else-if>
+        <else-if type="paper-conference">
+          <!-- For paper-conference, don't print publisher if in a journal-like proceedings -->
+          <choose>
+            <if variable="collection-editor editor editorial-director" match="any">
+              <text variable="publisher"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article-journal article-magazine article-newspaper post-weblog" match="none">
+          <text variable="publisher"/>
+        </else-if>
+      </choose>
+      <group delimiter=", ">
+        <choose>
+          <if variable="archive-place">
+            <!-- With `archive-place`: physical archives. Without: online archives. -->
+            <!-- For physical archives, print the location before the archive name.
+                For electronic archives, these are printed in macro="description". -->
+            <!-- Split "archive_location" into "archive_collection" and "archive_location" as that becomes available -->
+            <!-- Must test for archive_collection:
+                With collection: archive_collection (archive_location), archive, archive-place
+                No collection: archive (archive_location), archive-place
+            -->
+            <text variable="archive_location"/>
+          </if>
+        </choose>
+        <text variable="archive"/>
+        <text variable="archive-place"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else-if variable="URL">
         <group delimiter=" ">
-          <text term="in" text-case="capitalize-first" suffix=" "/>
-          <group delimiter=", ">
-            <text macro="container-contributors"/>
-            <group delimiter=" ">
-              <text macro="container-title"/>
-              <text macro="locators" prefix="(" suffix=")"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="genre" text-case="capitalize-first"/>
-                <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="issued status" match="none">
+              <group delimiter=" ">
+                <text term="retrieved" text-case="capitalize-first"/>
+                <date variable="accessed" form="text" suffix=","/>
+                <text term="from"/>
               </group>
-            </group>
-          </group>
+            </if>
+          </choose>
+          <text variable="URL"/>
         </group>
       </else-if>
-      <else-if type="paper-conference">
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
-          <if variable="editor collection-editor container-author" match="any">
-            <text macro="container-booklike"/>
-          </if>
-          <else>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <!-- Don't print event info if published in a proceedings -->
             <group delimiter=", ">
-              <text macro="container-title"/>
-              <text macro="locators"/>
+              <text variable="event"/>
+              <text variable="event-place"/>
             </group>
-          </else>
-        </choose>
-      </else-if>
-      <else-if type="book">
-        <choose>
-          <!-- book and software should not cite collection-title, only container-title -->
-          <if variable="container-title">
-            <text macro="container-booklike"/>
           </if>
         </choose>
-      </else-if>
-      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
-        <text macro="container-booklike"/>
-      </else-if>
-      <else-if type="bill legal_case legislation treaty" match="any">
-        <text macro="legal-cites"/>
-      </else-if>
+      </if>
     </choose>
   </macro>
-  <macro name="container-booklike">
+  <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
+  <macro name="publication-history">
     <choose>
-      <if variable="container-title collection-title" match="any">
-        <group delimiter=" ">
-          <text term="in" text-case="capitalize-first"/>
+      <if type="patent" match="none">
+        <group prefix="(" suffix=")">
+          <choose>
+            <if variable="references">
+              <!-- This provides the option for more elaborate description 
+                   of publication history, such as full "reprinted" references
+                   (examples 11, 43, 44) or retracted references -->
+              <text variable="references"/>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text value="Original work published"/>
+                <choose>
+                  <if is-uncertain-date="original-date">
+                    <text term="circa" form="short"/>
+                  </if>
+                </choose>
+                <date variable="original-date">
+                  <date-part name="year"/>
+                </date>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else>
+        <text variable="references" prefix="(" suffix=")"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- Legal citations have their own rules -->
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+            </group>
+            <text variable="references"/>
+          </group>
+          <text macro="access"/>
+        </group>
+      </if>
+      <else-if type="bill">
+        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+        <group delimiter=". ">
           <group delimiter=", ">
-            <text macro="container-contributors"/>
             <choose>
-              <if variable="container-author editor translator" match="none">
-                <group delimiter=". ">
-                  <group delimiter=": ">
-                    <text variable="collection-title" font-style="italic" text-case="title"/>
-                    <choose>
-                      <if variable="collection-title">
-                        <group delimiter=" ">
-                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                          <number variable="collection-number" font-style="italic" form="numeric"/>
-                          <choose>
-                            <if variable="collection-number" match="none">
-                              <number variable="volume" font-style="italic" form="numeric"/>
-                            </if>
-                          </choose>
-                        </group>
-                      </if>
-                    </choose>
-                  </group>
-                  <!-- Replace with volume-title as that becomes available -->
-                  <group delimiter=": ">
-                    <text macro="container-title"/>
-                    <choose>
-                      <if variable="collection-title" is-numeric="volume" match="none">
-                        <group delimiter=" ">
-                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                          <text variable="volume" font-style="italic"/>
-                        </group>
-                      </if>
-                    </choose>
-                  </group>
-                </group>
+              <if variable="number container-title" match="none">
+                <!-- If no number or container-title, then assume it is a hearing -->
+                <text variable="title" font-style="italic"/>
               </if>
               <else>
-                <!-- Replace with volume-title as that becomes available -->
-                <group delimiter=": ">
-                  <text macro="container-title"/>
-                  <choose>
-                    <if is-numeric="volume" match="none">
-                      <group delimiter=" ">
-                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                        <text variable="volume" font-style="italic"/>
-                      </group>
-                    </if>
-                  </choose>
-                </group>
+                <text variable="title"/>
               </else>
             </choose>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <choose>
+                <if variable="number container-title" match="none">
+                  <!-- If no number or container-title, then assume it is a hearing -->
+                  <names variable="author" prefix="(testimony of " suffix=")">
+                    <name and="symbol" delimiter=", "/>
+                  </names>
+                </if>
+                <else>
+                  <text variable="status" prefix="(" suffix=")"/>
+                </else>
+              </choose>
+            </group>
+            <text variable="references"/>
           </group>
-          <group delimiter="; " prefix="(" suffix=")">
-            <text macro="locators"/>
-            <names variable="container-author">
-              <label form="verb-short" suffix=" " text-case="title"/>
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-            </names>
+          <text macro="access"/>
+        </group>
+      </else-if>
+      <else-if type="legislation">
+        <!-- Currently designed to handle statutes, codified regulations, executive orders.
+             For uncodified regulations, assume future code section is in status. -->
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <text variable="status" prefix="(" suffix=")"/>
+            </group>
+            <text variable="references"/>
           </group>
+          <text macro="access"/>
         </group>
-      </if>
+      </else-if>
+      <else-if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
+          <text macro="access"/>
+        </group>
+      </else-if>
     </choose>
   </macro>
-  <macro name="container-title">
+  <macro name="date-legal">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper dataset" match="any">
-        <text variable="container-title" font-style="italic" text-case="title"/>
+      <if type="legal_case">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <text variable="authority"/>
+          <choose>
+            <if variable="container-title" match="any">
+              <!-- Print only year for cases published in reporters-->
+              <date variable="issued" form="numeric" date-parts="year"/>
+            </if>
+            <else>
+              <date variable="issued" form="text"/>
+            </else>
+          </choose>
+        </group>
       </if>
-      <else-if type="paper-conference speech">
-        <choose>
-          <if variable="collection-editor container-author editor" match="any">
-            <text variable="container-title" font-style="italic"/>
-          </if>
-          <else>
-            <text variable="container-title" font-style="italic" text-case="title"/>
-          </else>
-        </choose>
+      <else-if type="bill legislation" match="any">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <group delimiter=" ">
+            <date variable="original-date">
+              <date-part name="year"/>
+            </date>
+            <text term="and" form="symbol"/>
+          </group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
       </else-if>
-      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
-        <text variable="container-title" font-style="italic"/>
+      <else-if type="treaty">
+        <date variable="issued" form="text"/>
       </else-if>
     </choose>
   </macro>
-  <macro name="legal-cites">
+  <macro name="container-legal">
+    <!-- Expect legal item container-titles to be stored in short form -->
     <choose>
       <if type="legal_case">
-        <group prefix=", " delimiter=" ">
-          <group delimiter=" ">
-            <choose>
-              <if variable="container-title">
+        <group delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <group delimiter=" ">
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!--change to label variable="section" as that becomes available -->
+                  <!-- Change to label variable="section" as that becomes available -->
                   <text term="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
-                <text variable="page"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <choose>
-                    <if is-numeric="number">
-                      <!-- Replace with term="number" if that becomes available -->
-                      <text term="issue" form="short" text-case="capitalize-first"/>
-                    </if>
-                  </choose>
-                  <text variable="number"/>
-                </group>
-              </else>
-            </choose>
-          </group>
-          <group prefix="(" suffix=")" delimiter=" ">
-            <text variable="authority"/>
-            <choose>
-              <if variable="container-title" match="any">
-                <!--Only print year for cases published in reporters-->
-                <date variable="issued" form="numeric" date-parts="year"/>
-              </if>
-              <else>
-                <date variable="issued" form="text"/>
-              </else>
-            </choose>
-          </group>
+                <choose>
+                  <if variable="page page-first" match="any">
+                    <text variable="page-first"/>
+                  </if>
+                  <else>
+                    <text value="___"/>
+                  </else>
+                </choose>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <choose>
+                  <if is-numeric="number">
+                    <!-- Replace with label variable="number" if that becomes available -->
+                    <text term="issue" form="short" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
-        <group prefix=", " delimiter=" ">
-          <group delimiter=", ">
-            <choose>
-              <if variable="number">
-                <!--There's a public law number-->
-                <text variable="number" prefix="Pub. L. No. "/>
-                <group delimiter=" ">
-                  <!--change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
-                  <text variable="section"/>
-                </group>
-                <group delimiter=" ">
-                  <text variable="volume"/>
-                  <text variable="container-title"/>
-                  <text variable="page-first"/>
-                </group>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="volume"/>
-                  <text variable="container-title"/>
-                  <!--change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
-                  <text variable="section"/>
-                </group>
-              </else>
-            </choose>
+      <else-if type="bill">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <group delimiter=" ">
+              <choose>
+                <if variable="chapter-number container-title" match="none">
+                  <!-- Replace with label variable="number" as that becomes available -->
+                  <text term="issue" form="short"/>
+                </if>
+              </choose>
+              <text variable="number"/>
+            </group>
+          </group>
+          <text variable="authority"/>
+          <text variable="chapter-number"/>
+          <group delimiter=" ">
+            <text variable="volume"/>
+            <text variable="container-title"/>
+            <text variable="page-first"/>
           </group>
-          <date variable="issued" prefix="(" suffix=")">
-            <date-part name="year"/>
-          </date>
         </group>
       </else-if>
+      <else-if type="legislation">
+        <choose>
+          <if variable="number">
+            <!--There's a public law number-->
+            <group delimiter=", ">
+              <text variable="number" prefix="Pub. L. No. "/>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <text variable="page-first"/>
+              </group>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="volume"/>
+              <text variable="container-title"/>
+              <choose>
+                <if variable="section">
+                  <group delimiter=" ">
+                    <!-- Change to label variable="section" as that becomes available -->
+                    <text term="section" form="symbol"/>
+                    <text variable="section"/>
+                  </group>
+                </if>
+                <else>
+                  <text variable="page-first"/>
+                </else>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else-if>
       <else-if type="treaty">
         <group delimiter=" ">
           <number variable="volume"/>
           <text variable="container-title"/>
-          <text variable="page"/>
+          <choose>
+            <if variable="page page-first" match="any">
+              <text variable="page-first"/>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <!-- Replace with label variable="number" if that becomes available -->
+                <text term="issue" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
         </group>
       </else-if>
     </choose>
   </macro>
-  <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
+  <macro name="citation-locator">
+    <group delimiter=" ">
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
     <sort>
-      <key macro="author" names-min="8" names-use-first="6"/>
-      <key macro="issued-sort"/>
+      <key macro="author-bib" names-min="21" names-use-first="19"/>
+      <key macro="date-sort-group"/>
+      <key macro="date-sort-date" sort="ascending"/>
+      <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
-        <text macro="author-short"/>
-        <text macro="issued-citation"/>
+        <text macro="author-intext"/>
+        <text macro="date-intext"/>
         <text macro="citation-locator"/>
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2">
+  <bibliography hanging-indent="true" et-al-min="21" et-al-use-first="19" et-al-use-last="true" entry-spacing="0" line-spacing="2">
     <sort>
-      <key macro="author"/>
-      <key macro="issued-sort" sort="ascending"/>
+      <key macro="author-bib"/>
+      <key macro="date-sort-group"/>
+      <key macro="date-sort-date" sort="ascending"/>
+      <key variable="status"/>
       <key macro="title"/>
     </sort>
     <layout>
-      <group suffix=".">
-        <group delimiter=". ">
-          <text macro="author"/>
+      <choose>
+        <if type="bill legal_case legislation treaty" match="any">
+          <!-- Legal items have different orders and delimiters -->
           <choose>
-            <if is-uncertain-date="issued">
-              <group prefix=" [" suffix="]" delimiter=" ">
-                <text term="circa" form="short"/>
-                <text macro="issued"/>
-              </group>
+            <if variable="DOI URL" match="any">
+              <text macro="legal-cites"/>
             </if>
             <else>
-              <text macro="issued" prefix=" (" suffix=")"/>
+              <text macro="legal-cites" suffix="."/>
             </else>
           </choose>
-          <group delimiter=" ">
-            <text macro="title"/>
-            <choose>
-              <if variable="title interviewer" type="interview" match="any">
-                <group delimiter=" ">
-                  <text macro="description"/>
-                  <text macro="format"/>
-                </group>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text macro="format"/>
-                  <text macro="description"/>
-                </group>
-              </else>
-            </choose>
-          </group>
-          <text macro="container"/>
-        </group>
-        <text macro="event" prefix=". "/>
-      </group>
-      <text macro="access" prefix=" "/>
-      <choose>
-        <if is-uncertain-date="original-date">
-          <group prefix=" [" suffix="]" delimiter=" ">
-            <text macro="original-published"/>
-            <text term="circa" form="short"/>
-            <text macro="original-date"/>
-          </group>
         </if>
-        <else-if variable="original-date">
-          <group prefix=" (" suffix=")" delimiter=" ">
-            <text macro="original-published"/>
-            <text macro="original-date"/>
+        <else>
+          <group delimiter=" ">
+            <group delimiter=". " suffix=".">
+              <text macro="author-bib"/>
+              <text macro="date-bib"/>
+              <text macro="title-and-descriptions"/>
+              <text macro="container"/>
+              <text macro="event"/>
+              <text macro="publisher"/>
+            </group>
+            <text macro="access"/>
+            <text macro="publication-history"/>
           </group>
-        </else-if>
+        </else>
       </choose>
-      <text variable="abstract" display="block"/>
+      <text variable="note" display="block"/>
     </layout>
   </bibliography>
 </style>
diff --git a/apa-cv.csl b/apa-cv.csl
index 8b2ce1294bcb..fd83806c0be9 100644
--- a/apa-cv.csl
+++ b/apa-cv.csl
@@ -1,38 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
   <info>
-    <title>American Psychological Association 6th edition (curriculum vitae, sorted by descending date)</title>
-    <title-short>APA</title-short>
+    <title>American Psychological Association 7th edition (curriculum vitae, sorted by descending date)</title>
+    <title-short>APA (CV)</title-short>
     <id>http://www.zotero.org/styles/apa-cv</id>
     <link href="http://www.zotero.org/styles/apa-cv" rel="self"/>
     <link href="http://www.zotero.org/styles/apa" rel="template"/>
-    <link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
+    <link href="https://apastyle.apa.org/style-grammar-guidelines/references/examples" rel="documentation"/>
     <author>
-      <name>Simon Kornblith</name>
-      <email>simon@simonster.com</email>
-    </author>
-    <author>
-      <name> Brenton M. Wiernik</name>
+      <name>Brenton M. Wiernik</name>
       <email>zotero@wiernik.org</email>
     </author>
-    <contributor>
-      <name>Bruce D'Arcus</name>
-    </contributor>
-    <contributor>
-      <name>Curtis M. Humphrey</name>
-    </contributor>
-    <contributor>
-      <name>Richard Karnesky</name>
-      <email>karnesky+zotero@gmail.com</email>
-      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
-    </contributor>
-    <contributor>
-      <name>Sebastian Karcher</name>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <updated>2016-09-28T13:09:49+00:00</updated>
+    <updated>2019-12-04T13:09:49+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -42,14 +24,28 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
-      <term name="interviewer" form="short">interviewer</term>
+      <term name="interviewer" form="short">
+        <single>interviewer</single>
+        <multiple>interviewers</multiple>
+      </term>
+      <term name="collection-editor" form="short">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
       <term name="circa" form="short">ca.</term>
-      <term name="collection-editor" form="short">series ed.</term>
+      <term name="bc"> B.C.E.</term>
+      <term name="ad"> C.E.</term>
+      <term name="letter">personal communication</term>
+      <term name="letter" form="short">letter</term>
+      <term name="issue" form="long">
+        <single>issue</single>
+        <multiple>issues</multiple>
+      </term>
     </terms>
   </locale>
-  <locale xml:lang="es">
+  <locale xml:lang="da">
     <terms>
-      <term name="from">de</term>
+      <term name="et-al">et al.</term>
     </terms>
   </locale>
   <locale xml:lang="de">
@@ -57,828 +53,744 @@
       <term name="et-al">et al.</term>
     </terms>
   </locale>
-  <locale xml:lang="da">
+  <locale xml:lang="es">
     <terms>
-      <term name="et-al">et al.</term>
+      <term name="from">de</term>
     </terms>
   </locale>
-  <locale xml:lang="nn">
+  <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
     </terms>
   </locale>
-  <locale xml:lang="nb">
+  <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
     </terms>
   </locale>
-  <macro name="container-contributors-booklike">
-    <choose>
-      <if variable="container-title">
-        <names variable="editor translator" delimiter=", &amp; ">
-          <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          <substitute>
-            <names variable="editorial-director"/>
-            <names variable="collection-editor"/>
-            <names variable="container-author"/>
-          </substitute>
+  <!-- General categories of item types:
+        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
+        Periodical or Booklike: paper-conference
+        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
+                  graphic interview manuscript map motion_picture musical_score pamphlet patent 
+                  personal_communication report song speech thesis post webpage
+        Legal: bill legal_case legislation treaty
+  -->
+  <!-- APA references contain four parts: author, date, title, source -->
+  <macro name="author-bib">
+    <names variable="composer" delimiter=", ">
+      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <substitute>
+        <names variable="author"/>
+        <names variable="illustrator"/>
+        <names variable="director">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="long" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <choose>
+          <if variable="container-title">
+            <choose>
+              <if type="book entry entry-dictionary entry-encyclopedia" match="any">
+                <choose>
+                  <if variable="title">
+                    <group delimiter=" ">
+                      <text macro="title"/>
+                      <text macro="parenthetical"/>
+                    </group>
+                  </if>
+                  <else>
+                    <text macro="title-and-descriptions"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+        <!-- Test for editortranslator and put that first as that becomes available -->
+        <names variable="editor" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="editorial-director">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="collection-editor">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
         </names>
-      </if>
-    </choose>
-  </macro>
-  <macro name="container-contributors">
-    <choose>
-      <!-- book is here to catch software with container titles -->
-      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
-        <text macro="container-contributors-booklike"/>
-      </if>
-      <else-if type="paper-conference">
         <choose>
-          <if variable="collection-editor container-author editor" match="any">
-            <text macro="container-contributors-booklike"/>
+          <if variable="title">
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="parenthetical"/>
+            </group>
           </if>
+          <else>
+            <text macro="title-and-descriptions"/>
+          </else>
         </choose>
-      </else-if>
-    </choose>
+      </substitute>
+    </names>
   </macro>
-  <macro name="secondary-contributors-booklike">
-    <group delimiter="; ">
-      <choose>
-        <if variable="title">
-          <names variable="interviewer">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-        </if>
-      </choose>
+  <macro name="date-bib">
+    <group delimiter=" " prefix="(" suffix=")">
       <choose>
-        <if variable="container-title" match="none">
-          <group delimiter="; ">
-            <names variable="container-author">
-              <label form="verb-short" suffix=" " text-case="title"/>
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-            </names>
-            <names variable="editor translator" delimiter="; ">
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-              <label form="short" prefix=", " text-case="title"/>
-            </names>
-          </group>
+        <if is-uncertain-date="issued">
+          <text term="circa" form="short"/>
         </if>
       </choose>
-    </group>
-  </macro>
-  <macro name="secondary-contributors">
-    <choose>
-      <!-- book is here to catch software with container titles -->
-      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
-        <text macro="secondary-contributors-booklike"/>
-      </if>
-      <else-if type="personal_communication">
-        <group delimiter="; ">
-          <group delimiter=" ">
+      <group>
+        <choose>
+          <if variable="issued">
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+            <text variable="year-suffix"/>
             <choose>
-              <if variable="genre" match="any">
-                <text variable="genre" text-case="capitalize-first"/>
+              <if type="article-magazine article-newspaper broadcast interview motion_picture pamphlet personal_communication post post-weblog song speech webpage" match="any">
+                <!-- Many video and audio examples in manual give full dates. Err on the side of too much information. -->
+                <date variable="issued">
+                  <date-part prefix=", " name="month"/>
+                  <date-part prefix=" " name="day"/>
+                </date>
               </if>
-              <else>
-                <text term="letter" text-case="capitalize-first"/>
-              </else>
+              <else-if type="paper-conference">
+                <!-- Capture 'speech' stored as 'paper-conference' -->
+                <choose>
+                  <if variable="collection-editor editor editorial-director issue page volume" match="none">
+                    <date variable="issued">
+                      <date-part prefix=", " name="month"/>
+                      <date-part prefix=" " name="day"/>
+                    </date>
+                  </if>
+                </choose>
+              </else-if>
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
-            <names variable="recipient" delimiter=", ">
-              <label form="verb" suffix=" "/>
-              <name and="symbol" delimiter=", "/>
-            </names>
-          </group>
-          <text variable="medium" text-case="capitalize-first"/>
-          <choose>
-            <if variable="container-title" match="none">
-              <names variable="editor translator" delimiter="; ">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </if>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="song">
-        <choose>
-          <if variable="original-author composer" match="any">
-            <group delimiter="; ">
-              <!-- Replace prefix with performer label as that becomes available -->
-              <names variable="author" prefix="Recorded by ">
-                <label form="verb" text-case="title"/>
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-              </names>
-              <names variable="translator">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </group>
-          </if>
-        </choose>
-      </else-if>
-      <else-if type="article-journal article-magazine article-newspaper" match="any">
-        <group delimiter="; ">
-          <choose>
-            <if variable="title">
-              <names variable="interviewer" delimiter="; ">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </if>
-          </choose>
-          <names variable="translator" delimiter="; ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-        </group>
-      </else-if>
-      <else-if type="paper-conference">
-        <choose>
-          <if variable="collection-editor editor" match="any">
-            <text macro="secondary-contributors-booklike"/>
           </if>
+          <else-if variable="status">
+            <group>
+              <text variable="status" text-case="lowercase"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
+          </else-if>
           <else>
-            <group delimiter="; ">
-              <choose>
-                <if variable="title">
-                  <names variable="interviewer" delimiter="; ">
-                    <name and="symbol" initialize-with=". " delimiter=", "/>
-                    <label form="short" prefix=", " text-case="title"/>
-                  </names>
-                </if>
-              </choose>
-              <names variable="translator" delimiter="; ">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
+            <group>
+              <text term="no date" form="short"/>
+              <text variable="year-suffix" prefix="-"/>
             </group>
           </else>
         </choose>
+      </group>
+    </group>
+  </macro>
+  <macro name="date-sort-group">
+    <choose>
+      <if variable="issued">
+        <text value="1"/>
+      </if>
+      <else-if variable="status">
+        <text value="2"/>
       </else-if>
       <else>
-        <group delimiter="; ">
-          <choose>
-            <if variable="title">
-              <names variable="interviewer">
-                <name and="symbol" initialize-with=". " delimiter="; "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </if>
-          </choose>
-          <names variable="editor translator" delimiter="; ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-        </group>
+        <text value="3"/>
       </else>
     </choose>
   </macro>
-  <macro name="author">
+  <macro name="date-sort-date">
     <choose>
-      <if type="song">
-        <names variable="composer" delimiter=", ">
-          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-          <substitute>
-            <names variable="original-author"/>
-            <names variable="author"/>
-            <names variable="translator">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <group delimiter=" ">
-              <text macro="title"/>
-              <text macro="description"/>
-              <text macro="format"/>
-            </group>
-          </substitute>
-        </names>
+      <if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
+        <date variable="issued" form="numeric"/>
       </if>
-      <else-if type="treaty"/>
+      <else-if type="paper-conference">
+        <!-- Capture 'speech' stored as 'paper-conference' -->
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <date variable="issued" form="numeric"/>
+          </if>
+        </choose>
+      </else-if>
       <else>
-        <names variable="author" delimiter=", ">
-          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-          <substitute>
-            <names variable="illustrator"/>
-            <names variable="composer"/>
-            <names variable="director">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="long" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <choose>
-              <if variable="container-title">
-                <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia">
-                    <text macro="title"/>
-                  </if>
-                  <else>
-                    <names variable="translator"/>
-                  </else>
-                </choose>
-                <names variable="translator">
-                  <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-                  <label form="short" prefix=" (" suffix=")" text-case="title"/>
-                </names>
-              </if>
-            </choose>
-            <names variable="editor translator" delimiter=", ">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <names variable="editorial-director">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <names variable="collection-editor">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <choose>
-              <if type="report">
-                <text variable="publisher"/>
-              </if>
-            </choose>
-            <group delimiter=" ">
-              <text macro="title"/>
-              <text macro="description"/>
-              <text macro="format"/>
-            </group>
-          </substitute>
-        </names>
+        <date variable="issued" form="numeric"/>
       </else>
     </choose>
   </macro>
-  <macro name="patent-number">
-    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
-    <group delimiter=" ">
-      <text variable="authority"/>
-      <choose>
-        <if variable="genre">
-          <text variable="genre" text-case="capitalize-first"/>
-        </if>
-        <else>
-          <!-- This should be localized -->
-          <text value="patent" text-case="capitalize-first"/>
-        </else>
-      </choose>
-      <group delimiter=" ">
-        <text term="issue" form="short" text-case="capitalize-first"/>
-        <text variable="number"/>
-      </group>
-    </group>
-  </macro>
-  <macro name="access">
+  <!-- APA has two description elements following the title:
+        title (parenthetical) [bracketed]  -->
+  <macro name="title-and-descriptions">
     <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if variable="DOI" match="any">
-        <text variable="DOI" prefix="https://doi.org/"/>
-      </else-if>
-      <else-if variable="URL">
+      <if variable="title">
         <group delimiter=" ">
-          <text term="retrieved" text-case="capitalize-first"/>
-          <choose>
-            <if type="post post-weblog webpage" match="any">
-              <date variable="accessed" form="text" suffix=","/>
-            </if>
-          </choose>
-          <text term="from"/>
-          <choose>
-            <if type="report">
-              <choose>
-                <if variable="author editor translator" match="any">
-                  <!-- This should be localized -->
-                  <text variable="publisher" suffix=" website:"/>
-                </if>
-              </choose>
-            </if>
-            <else-if type="post post-weblog webpage" match="any">
-              <!-- This should be localized -->
-              <text variable="container-title" suffix=" website:"/>
-            </else-if>
-          </choose>
-          <text variable="URL"/>
+          <text macro="title"/>
+          <text macro="parenthetical"/>
+          <text macro="bracketed"/>
         </group>
-      </else-if>
-      <else-if variable="archive">
-        <choose>
-          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
-            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
-            <choose>
-              <if variable="archive-place" match="none">
-                <group delimiter=" ">
-                  <text term="retrieved" text-case="capitalize-first"/>
-                  <text term="from"/>
-                  <text variable="archive" suffix="."/>
-                  <text variable="archive_location" prefix="(" suffix=")"/>
-                </group>
-              </if>
-              <else>
-                <text macro="publisher" suffix="."/>
-              </else>
-            </choose>
-          </if>
-          <else>
-            <text macro="publisher" suffix="."/>
-          </else>
-        </choose>
-      </else-if>
+      </if>
       <else>
-        <text macro="publisher" suffix="."/>
+        <group delimiter=" ">
+          <text macro="bracketed"/>
+          <text macro="parenthetical"/>
+        </group>
       </else>
     </choose>
   </macro>
   <macro name="title">
     <choose>
-      <if type="treaty">
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-        </group>
+      <if type="post webpage" match="any">
+        <!-- Webpages are always italicized -->
+        <text variable="title" font-style="italic"/>
       </if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
+      <else-if variable="container-title" match="any">
+        <!-- Other types are italicized based on presence of container-title.
+              Assume that review and review-book are published in periodicals/blogs,
+              not just on a web page (ex. 69) -->
+        <text variable="title"/>
       </else-if>
-      <else-if variable="title">
+      <else>
         <choose>
-          <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a software type -->
-            <text variable="title"/>
+          <if type="article-journal article-magazine article-newspaper post-weblog review review-book">
+            <text variable="title" font-style="italic"/>
           </if>
-          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <else-if type="paper-conference">
             <choose>
-              <if variable="reviewed-title">
-                <choose>
-                  <if type="post post-weblog webpage" variable="container-title" match="any">
-                    <text variable="title"/>
-                  </if>
-                  <else>
-                    <text variable="title" font-style="italic"/>
-                  </else>
-                </choose>
+              <if variable="collection-editor editor editorial-director" match="any">
+                <group delimiter=": " font-style="italic">
+                  <text variable="title"/>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <label variable="volume" form="short" text-case="capitalize-first"/>
+                        <text variable="volume"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
               </if>
+              <else>
+                <text variable="title" font-style="italic"/>
+              </else>
             </choose>
           </else-if>
-          <else-if type="post post-weblog webpage" variable="container-title" match="any">
-            <text variable="title"/>
-          </else-if>
           <else>
-            <text variable="title" font-style="italic"/>
+            <group delimiter=": " font-style="italic">
+              <text variable="title"/>
+              <!-- Replace with volume-title as that becomes available -->
+              <choose>
+                <if is-numeric="volume" match="none">
+                  <group delimiter=" ">
+                    <label variable="volume" form="short" text-case="capitalize-first"/>
+                    <text variable="volume"/>
+                  </group>
+                </if>
+              </choose>
+            </group>
           </else>
         </choose>
-      </else-if>
-      <else-if variable="interviewer" type="interview" match="any">
-        <names variable="interviewer">
-          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
-          <name and="symbol" initialize-with=". " delimiter=", "/>
-        </names>
-      </else-if>
+      </else>
     </choose>
   </macro>
-  <!-- APA has four descriptive sections following the title: -->
-  <!-- (description), [format], container, event -->
-  <macro name="description">
+  <macro name="parenthetical">
+    <!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->
     <group prefix="(" suffix=")">
       <choose>
-        <!-- book is here to catch software with container titles -->
-        <if type="book report" match="any">
-          <choose>
-            <if variable="container-title">
-              <text macro="secondary-contributors"/>
-            </if>
-            <else>
-              <group delimiter="; ">
-                <text macro="description-report"/>
-                <text macro="secondary-contributors"/>
-              </group>
-            </else>
-          </choose>
+        <if type="patent">
+          <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
+          <group delimiter=" ">
+            <text variable="authority" form="short"/>
+            <choose>
+              <if variable="genre">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <text value="patent" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <group delimiter=" ">
+              <!-- Replace with label variable="number" if that becomes available -->
+              <text term="issue" form="short" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </group>
         </if>
-        <else-if type="thesis">
+        <else-if type="post webpage">
+          <!-- For post webpage, container-title is treated as publisher -->
           <group delimiter="; ">
-            <group delimiter=", ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <choose>
-                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
-                <if variable="DOI URL archive" match="any">
-                  <text variable="publisher"/>
-                </if>
-              </choose>
-            </group>
-            <text macro="locators"/>
             <text macro="secondary-contributors"/>
+            <text macro="database-location"/>
+            <text macro="number"/>
+            <text macro="locators-booklike"/>
           </group>
         </else-if>
-        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+        <else-if variable="container-title">
           <group delimiter="; ">
-            <text macro="locators"/>
             <text macro="secondary-contributors"/>
+            <choose>
+              <if type="broadcast graphic map motion_picture song" match="any">
+                <!-- For audiovisual media, number information comes after title, not container-title -->
+                <text macro="number"/>
+              </if>
+            </choose>
           </group>
         </else-if>
-        <else-if type="song">
+        <else>
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <text macro="database-location"/>
+            <text macro="number"/>
+            <text macro="locators-booklike"/>
+          </group>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="parenthetical-container">
+    <choose>
+      <if variable="container-title" match="any">
+        <group prefix="(" suffix=")">
+          <group delimiter="; ">
+            <text macro="database-location"/>
+            <choose>
+              <if type="broadcast graphic map motion_picture song" match="none">
+                <!-- For audiovisual media, number information comes after title, not container-title -->
+                <text macro="number"/>
+              </if>
+            </choose>
+            <text macro="locators-booklike"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="bracketed">
+    <!-- [Descriptive information] -->
+    <!-- If there is a number, genre is already printed in macro="number" -->
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <!-- Reviewed item -->
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <!-- Assume that genre is entered as 'Review of the book' or similar -->
+                <choose>
+                  <if variable="number" match="none">
+                    <choose>
+                      <if variable="genre">
+                        <text variable="genre" text-case="capitalize-first"/>
+                      </if>
+                      <else-if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </else-if>
+                      <else>
+                        <!-- Replace with term="review" as that becomes available -->
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </if>
+                  <else>
+                    <choose>
+                      <if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                      <else>
+                        <!-- Replace with term="review" as that becomes available -->
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </else>
+                </choose>
+                <text macro="reviewed-title"/>
+              </group>
+              <names variable="reviewed-author">
+                <label form="verb-short" suffix=" "/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+            </group>
+            <choose>
+              <if variable="genre" match="any">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </group>
+        </if>
+        <else-if type="thesis">
+          <!-- Thesis type and institution -->
+          <group delimiter="; ">
+            <choose>
+              <if variable="number" match="none">
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="archive DOI URL" match="any">
+                      <!-- Include the university in brackets if thesis is published -->
+                      <text variable="publisher"/>
+                    </if>
+                  </choose>
+                </group>
+              </if>
+            </choose>
+            <text variable="medium" text-case="capitalize-first"/>
+          </group>
+        </else-if>
+        <else-if variable="interviewer" type="interview" match="any">
+          <!-- Interview information -->
           <choose>
-            <if variable="container-title" match="none">
-              <text macro="locators"/>
+            <if variable="title">
+              <text macro="format"/>
             </if>
+            <else-if variable="genre">
+              <group delimiter="; ">
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <group delimiter=" ">
+                    <text term="author" form="verb"/>
+                    <names variable="interviewer">
+                      <name and="symbol" initialize-with=". " delimiter=", "/>
+                    </names>
+                  </group>
+                </group>
+              </group>
+            </else-if>
+            <else-if variable="interviewer">
+              <group delimiter="; ">
+                <names variable="interviewer">
+                  <label form="verb" suffix=" " text-case="capitalize-first"/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                </names>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </else-if>
+            <else>
+              <text macro="format"/>
+            </else>
           </choose>
         </else-if>
-        <else-if type="article dataset figure" match="any">
+        <else-if type="personal_communication">
+          <!-- Letter information -->
           <choose>
-            <if variable="container-title">
-              <text macro="secondary-contributors"/>
-            </if>
-            <else>
+            <if variable="recipient">
               <group delimiter="; ">
-                <text macro="locators"/>
-                <text macro="secondary-contributors"/>
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="number" match="none">
+                      <choose>
+                        <if variable="genre">
+                          <text variable="genre" text-case="capitalize-first"/>
+                        </if>
+                        <else-if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </else-if>
+                        <else>
+                          <text term="letter" form="short" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </if>
+                    <else>
+                      <choose>
+                        <if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </if>
+                        <else>
+                          <text term="letter" form="short" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </else>
+                  </choose>
+                  <names variable="recipient" delimiter=", ">
+                    <label form="verb" suffix=" "/>
+                    <name and="symbol" delimiter=", "/>
+                  </names>
+                </group>
+                <choose>
+                  <if variable="genre" match="any">
+                    <choose>
+                      <if variable="number" match="none">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                    </choose>
+                  </if>
+                </choose>
               </group>
+            </if>
+            <else>
+              <text macro="format"/>
             </else>
           </choose>
         </else-if>
-        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
-          <text macro="secondary-contributors"/>
-        </else-if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="format">
-    <group prefix="[" suffix="]">
-      <choose>
-        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <group delimiter=", ">
+        <else-if variable="composer" type="song" match="all">
+          <!-- Performer of classical music works -->
+          <group delimiter="; ">
             <choose>
-              <if variable="genre">
-                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
-                <group delimiter=", ">
-                  <text variable="genre" text-case="capitalize-first"/>
+              <if variable="number" match="none">
+                <group delimiter=" ">
                   <choose>
-                    <if variable="reviewed-title">
-                      <text variable="reviewed-title" font-style="italic"/>
+                    <if variable="genre">
+                      <text variable="genre" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
                     </if>
+                    <else-if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else-if>
                     <else>
-                      <!-- Assume `title` is title of reviewed work -->
-                      <text variable="title" font-style="italic"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
                     </else>
                   </choose>
                 </group>
               </if>
               <else>
-                <!-- This should be localized -->
                 <group delimiter=" ">
-                  <text value="Review of"/>
                   <choose>
-                    <if variable="reviewed-title">
-                      <text variable="reviewed-title" font-style="italic"/>
+                    <if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
                     </if>
                     <else>
-                      <!-- Assume `title` is title of reviewed work -->
-                      <text variable="title" font-style="italic"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
                     </else>
                   </choose>
                 </group>
               </else>
             </choose>
-            <names variable="reviewed-author">
-              <label form="verb-short" suffix=" "/>
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-            </names>
+            <choose>
+              <if variable="genre" match="any">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
           </group>
-        </if>
+        </else-if>
+        <else-if variable="container-title" match="none">
+          <!-- Other description -->
+          <text macro="format"/>
+        </else-if>
         <else>
-          <text macro="format-short"/>
+          <!-- For conference presentations, chapters in reports, software, place bracketed after the container title -->
+          <choose>
+            <if type="paper-conference speech" match="any">
+              <choose>
+                <if variable="collection-editor editor editorial-director issue page volume" match="any">
+                  <text macro="format"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="book">
+              <choose>
+                <if variable="version" match="none">
+                  <text macro="format"/>
+                </if>
+              </choose>
+            </else-if>
+            <else-if type="report" match="none">
+              <text macro="format"/>
+            </else-if>
+          </choose>
         </else>
       </choose>
     </group>
   </macro>
-  <macro name="format-short">
+  <macro name="bracketed-container">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if type="paper-conference speech" match="any">
+          <!-- Conference presentations should describe the session [container] in bracketed unless published in a proceedings -->
+          <choose>
+            <if variable="collection-editor editor editorial-director issue page volume" match="none">
+              <text macro="format"/>
+            </if>
+          </choose>
+        </if>
+        <else-if type="book" variable="version" match="all">
+          <!-- For entries in mobile app reference works, place bracketed after the container-title -->
+          <text macro="format"/>
+        </else-if>
+        <else-if type="report">
+          <!-- For chapters in reports, place bracketed after the container title -->
+          <text macro="format"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
     <choose>
-      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <text macro="secondary-contributors-periodical"/>
+      </if>
+      <else-if type="paper-conference">
         <choose>
-          <if variable="reviewed-title" match="none">
-            <choose>
-              <if variable="genre">
-                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
-                <group delimiter=", ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text variable="title" form="short" font-style="italic"/>
-                </group>
-              </if>
-              <else>
-                <!-- This should be localized -->
-                <group delimiter=" ">
-                  <text value="Review of"/>
-                  <text variable="title" form="short" font-style="italic"/>
-                </group>
-              </else>
-            </choose>
+          <if variable="collection-editor editor editorial-director" match="any">
+            <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
-            <text variable="title" form="short" quotes="true"/>
+            <text macro="secondary-contributors-periodical"/>
           </else>
         </choose>
-      </if>
-      <else-if type="speech thesis" match="any">
-        <text variable="medium" text-case="capitalize-first"/>
       </else-if>
-      <!-- book is here to catch software with container titles -->
-      <else-if type="book report" match="any">
-        <choose>
-          <if variable="container-title" match="none">
-            <text macro="format-report"/>
-          </if>
-        </choose>
-      </else-if>
-      <else-if type="manuscript pamphlet" match="any">
-        <text variable="medium" text-case="capitalize-first"/>
-      </else-if>
-      <else-if type="personal_communication">
-        <text macro="secondary-contributors"/>
-      </else-if>
-      <else-if type="song">
-        <group delimiter="; ">
-          <text macro="secondary-contributors"/>
+      <else>
+        <text macro="secondary-contributors-booklike"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-periodical">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <names variable="translator" delimiter="; ">
+        <name and="symbol" initialize-with=". " delimiter=", "/>
+        <label form="short" prefix=", " text-case="title"/>
+      </names>
+    </group>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <!-- When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
+      <choose>
+        <if type="post webpage" match="none">
+          <!-- Webpages treat container-title like publisher -->
           <choose>
             <if variable="container-title" match="none">
-              <group delimiter=", ">
-                <text variable="genre" text-case="capitalize-first"/>
-                <text variable="medium" text-case="capitalize-first"/>
+              <group delimiter="; ">
+                <names variable="container-author">
+                  <label form="verb-short" suffix=" " text-case="title"/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                </names>
+                <names variable="editor translator" delimiter="; ">
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                  <label form="short" prefix=", " text-case="title"/>
+                </names>
               </group>
             </if>
           </choose>
-        </group>
-      </else-if>
-      <else-if type="paper-conference">
-        <group delimiter=", ">
-          <choose>
-            <if variable="collection-editor editor issue page volume" match="any">
-              <text variable="genre" text-case="capitalize-first"/>
-            </if>
-          </choose>
-          <text variable="medium" text-case="capitalize-first"/>
-        </group>
-      </else-if>
-      <else-if type="bill legislation legal_case patent treaty" match="none">
-        <choose>
-          <if variable="genre medium" match="any">
-            <group delimiter=", ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <text variable="medium" text-case="capitalize-first"/>
-            </group>
-          </if>
-          <else-if type="dataset">
-            <!-- This should be localized -->
-            <text value="Data set"/>
-          </else-if>
-        </choose>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="description-report">
-    <choose>
-      <if variable="number">
-        <group delimiter="; ">
-          <group delimiter=" ">
-            <text variable="genre" text-case="title"/>
-            <!-- Replace with term="number" if that becomes available -->
-            <text term="issue" form="short" text-case="capitalize-first"/>
-            <text variable="number"/>
+        </if>
+        <else>
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
           </group>
-          <text macro="locators"/>
-        </group>
-      </if>
-      <else>
-        <text macro="locators"/>
-      </else>
-    </choose>
+        </else>
+      </choose>
+    </group>
   </macro>
-  <macro name="format-report">
+  <macro name="database-location">
     <choose>
-      <if variable="number">
-        <text variable="medium" text-case="capitalize-first"/>
+      <if variable="archive-place" match="none">
+        <!-- With `archive-place`: physical archives. Without: online archives. -->
+        <!-- Add archive_collection as that becomes available -->
+        <text variable="archive_location"/>
       </if>
-      <else>
-        <group delimiter=", ">
-          <text variable="genre" text-case="capitalize-first"/>
-          <text variable="medium" text-case="capitalize-first"/>
-        </group>
-      </else>
     </choose>
   </macro>
-  <macro name="archive">
-    <group delimiter=". ">
-      <group delimiter=", ">
-        <choose>
-          <if type="manuscript">
-            <text variable="genre"/>
-          </if>
-        </choose>
-        <group delimiter=" ">
-          <!-- Replace "archive" with "archive_collection" as that becomes available -->
-          <text variable="archive"/>
-          <text variable="archive_location" prefix="(" suffix=")"/>
-        </group>
-      </group>
-      <group delimiter=", ">
-        <!-- Move "archive" here when "archive_collection" becomes available -->
-        <text variable="archive-place"/>
-      </group>
-    </group>
-  </macro>
-  <macro name="publisher">
+  <macro name="number">
     <choose>
-      <if type="manuscript pamphlet" match="any">
-        <choose>
-          <if variable="archive archive_location archive-place" match="any">
-            <group delimiter=". ">
-              <group delimiter=": ">
-                <text variable="publisher-place"/>
-                <text variable="publisher"/>
-              </group>
-              <text macro="archive"/>
-            </group>
-          </if>
-          <else>
-            <group delimiter=", ">
-              <text variable="genre"/>
-              <text variable="publisher"/>
-              <text variable="publisher-place"/>
-            </group>
-          </else>
-        </choose>
-      </if>
-      <else-if type="thesis" match="any">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="publisher"/>
-            <text variable="publisher-place"/>
-          </group>
-          <text macro="archive"/>
-        </group>
-      </else-if>
-      <else-if type="patent">
-        <group delimiter=". ">
-          <group delimiter=": ">
-            <text variable="publisher-place"/>
-            <text variable="publisher"/>
+      <if variable="number">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="genre" text-case="title"/>
+            <choose>
+              <if is-numeric="number">
+                <!-- Replace with label variable="number" if that becomes available -->
+                <text term="issue" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </if>
+              <else>
+                <text variable="number"/>
+              </else>
+            </choose>
           </group>
-          <text macro="archive"/>
-        </group>
-      </else-if>
-      <else-if type="article-journal article-magazine article-newspaper" match="any">
-        <text macro="archive"/>
-      </else-if>
-      <else-if type="post post-weblog webpage" match="none">
-        <group delimiter=". ">
           <choose>
-            <if variable="event">
+            <if type="thesis">
               <choose>
-                <!-- Only print publisher info if published in a proceedings -->
-                <if variable="collection-editor editor issue page volume" match="any">
-                  <group delimiter=": ">
-                    <text variable="publisher-place"/>
-                    <text variable="publisher"/>
-                  </group>
+                <!-- Include the university in brackets if thesis is published -->
+                <if variable="archive DOI URL" match="any">
+                  <text variable="publisher"/>
                 </if>
               </choose>
             </if>
-            <else>
-              <group delimiter=": ">
-                <text variable="publisher-place"/>
-                <text variable="publisher"/>
-              </group>
-            </else>
           </choose>
-          <text macro="archive"/>
         </group>
-      </else-if>
+      </if>
     </choose>
   </macro>
-  <macro name="event">
+  <macro name="locators-booklike">
     <choose>
-      <if variable="event" type="speech paper-conference" match="any">
+      <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>
+      <else-if type="paper-conference">
         <choose>
-          <!-- Don't print event info if published in a proceedings -->
-          <if variable="collection-editor editor issue page volume" match="none">
-            <group delimiter=" ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <group delimiter=" ">
-                <choose>
-                  <if variable="genre">
-                    <text term="presented at"/>
-                  </if>
-                  <else>
-                    <text term="presented at" text-case="capitalize-first"/>
-                  </else>
-                </choose>
-                <group delimiter=", ">
-                  <text variable="event"/>
-                  <text variable="event-place"/>
-                </group>
-              </group>
+          <if variable="collection-editor editor editorial-director" match="any">
+            <group delimiter=", ">
+              <text macro="version"/>
+              <text macro="edition"/>
+              <text macro="volume-booklike"/>
             </group>
           </if>
         </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="issued">
-    <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if variable="issued">
-        <group>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
-          <text variable="year-suffix"/>
-          <choose>
-            <if type="speech">
-              <date variable="issued" delimiter=" ">
-                <date-part prefix=", " name="month"/>
-              </date>
-            </if>
-            <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
-              <date variable="issued">
-                <date-part prefix=", " name="month"/>
-                <date-part prefix=" " name="day"/>
-              </date>
-            </else-if>
-            <else-if type="paper-conference">
-              <choose>
-                <if variable="container-title" match="none">
-                  <date variable="issued">
-                    <date-part prefix=", " name="month"/>
-                    <date-part prefix=" " name="day"/>
-                  </date>
-                </if>
-              </choose>
-            </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
-          </choose>
-        </group>
-      </else-if>
-      <else-if variable="status">
-        <group>
-          <text variable="status" text-case="lowercase"/>
-          <text variable="year-suffix" prefix="-"/>
-        </group>
       </else-if>
       <else>
-        <group>
-          <text term="no date" form="short"/>
-          <text variable="year-suffix" prefix="-"/>
+        <group delimiter=", ">
+          <text macro="version"/>
+          <text macro="edition"/>
+          <text macro="volume-booklike"/>
         </group>
       </else>
     </choose>
   </macro>
-  <macro name="issued-sort">
+  <macro name="version">
     <choose>
-      <if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
-        <date variable="issued">
-          <date-part name="year"/>
-          <date-part name="month"/>
-          <date-part name="day"/>
-        </date>
+      <if is-numeric="version">
+        <group delimiter=" ">
+          <!-- replace with label variable="version" if that becomes available -->
+          <text term="version" text-case="capitalize-first"/>
+          <text variable="version"/>
+        </group>
       </if>
       <else>
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
-      </else>
-    </choose>
-  </macro>
-  <macro name="original-date">
-    <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech">
-        <date variable="original-date" delimiter=" ">
-          <date-part name="month"/>
-          <date-part name="year"/>
-        </date>
-      </else-if>
-      <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
-        <date variable="original-date" form="text"/>
-      </else-if>
-      <else>
-        <date variable="original-date">
-          <date-part name="year"/>
-        </date>
-      </else>
-    </choose>
-  </macro>
-  <macro name="original-published">
-    <!--This should be localized -->
-    <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if type="interview motion_picture song" match="any">
-        <text value="Original work recorded"/>
-      </else-if>
-      <else-if type="broadcast">
-        <text value="Original work broadcast"/>
-      </else-if>
-      <else>
-        <text value="Original work published"/>
+        <text variable="version"/>
       </else>
     </choose>
   </macro>
@@ -887,7 +799,7 @@
       <if is-numeric="edition">
         <group delimiter=" ">
           <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short"/>
+          <label variable="edition" form="short"/>
         </group>
       </if>
       <else>
@@ -895,491 +807,618 @@
       </else>
     </choose>
   </macro>
-  <macro name="locators">
-    <choose>
-      <if type="article-journal article-magazine figure review review-book" match="any">
-        <group delimiter=", ">
+  <macro name="volume-booklike">
+    <group delimiter=", ">
+      <!-- Report series [ex. 52] -->
+      <choose>
+        <if type="report">
+          <group delimiter=" ">
+            <text variable="collection-title" text-case="title"/>
+            <text variable="collection-number"/>
+          </group>
+        </if>
+      </choose>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <!-- Non-numeric volumes are already printed as part of the book title -->
+            <if is-numeric="volume" match="none"/>
+            <else>
+              <group delimiter=" ">
+                <label variable="volume" form="short" text-case="capitalize-first"/>
+                <number variable="volume" form="numeric"/>
+              </group>
+            </else>
+          </choose>
+        </if>
+        <else>
           <group>
-            <text variable="volume" font-style="italic"/>
-            <text variable="issue" prefix="(" suffix=")"/>
+            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <text term="page-range-delimiter" prefix="1"/>
+            <number variable="number-of-volumes" form="numeric"/>
           </group>
-          <text variable="page"/>
-        </group>
+        </else>
+      </choose>
+      <group delimiter=" ">
+        <label variable="issue" text-case="capitalize-first"/>
+        <text variable="issue"/>
+      </group>
+      <group delimiter=" ">
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="reviewed-title">
+    <choose>
+      <if variable="reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed 
+              works [Ex. 69] -->
+        <text variable="reviewed-title" font-style="italic"/>
       </if>
-      <else-if type="article-newspaper">
-        <group delimiter=" ">
-          <label variable="page" form="short"/>
-          <text variable="page"/>
+      <else>
+        <!-- Assume title is title of reviewed work -->
+        <text variable="title" font-style="italic"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="format">
+    <choose>
+      <if variable="genre medium" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="number" match="none">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
         </group>
+      </if>
+      <!-- Generic labels for specific types -->
+      <!-- These should be localized when possible -->
+      <else-if type="dataset">
+        <text value="Data set"/>
+      </else-if>
+      <else-if type="book" variable="version" match="all">
+        <!-- Replace with type="software" and term="software" as that becomes available -->
+        <text value="Computer software"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="letter" text-case="capitalize-first"/>
+          </if>
+          <else-if type="interview">
+            <text term="interview" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="map">
+        <text value="Map"/>
       </else-if>
+    </choose>
+  </macro>
+  <!-- APA 'source' element contains four parts:
+        container, event, publisher, access -->
+  <macro name="container">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <!-- Periodical items -->
+        <text macro="container-periodical"/>
+      </if>
       <else-if type="paper-conference">
+        <!-- Determine if paper-conference is a periodical or booklike -->
         <choose>
-          <if variable="collection-editor editor" match="any">
-            <text macro="locators-booklike"/>
+          <if variable="editor editorial-director collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
           </if>
           <else>
-            <group delimiter=", ">
-              <group>
-                <text variable="volume" font-style="italic"/>
-                <text variable="issue" prefix="(" suffix=")"/>
-              </group>
-              <text variable="page"/>
-            </group>
+            <text macro="container-periodical"/>
           </else>
         </choose>
       </else-if>
-      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
-        <text macro="locators-booklike"/>
+      <else-if type="post webpage" match="none">
+        <!-- post and webpage treat container-title like publisher -->
+        <text macro="container-booklike"/>
       </else-if>
     </choose>
   </macro>
-  <macro name="locators-booklike">
-    <group delimiter=", ">
-      <text macro="edition"/>
-      <group delimiter=" ">
-        <text term="version" text-case="capitalize-first"/>
-        <text variable="version"/>
+  <macro name="container-periodical">
+    <group delimiter=". ">
+      <group delimiter=", ">
+        <text variable="container-title" font-style="italic" text-case="title"/>
+        <choose>
+          <if variable="volume">
+            <group>
+              <text variable="volume" font-style="italic"/>
+              <text variable="issue" prefix="(" suffix=")"/>
+            </group>
+          </if>
+          <else>
+            <text variable="issue" font-style="italic"/>
+          </else>
+        </choose>
+        <choose>
+          <if variable="page">
+            <text variable="page"/>
+          </if>
+          <else>
+            <!-- Ex. 6: Journal article with article number or eLocator -->
+            <!-- This should be localized -->
+            <text variable="number" prefix="Article "/>
+          </else>
+        </choose>
       </group>
       <choose>
-        <if variable="volume" match="any">
+        <if variable="issued">
           <choose>
-            <if is-numeric="volume" match="none"/>
-            <else-if variable="collection-title">
+            <if variable="issue page volume" match="none">
+              <text variable="status" text-case="capitalize-first"/>
+            </if>
+          </choose>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <names variable="editor translator" delimiter=", &amp; ">
+              <!-- Change to editortranslator and move editor to substitute as that becomes available -->
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" text-case="title" prefix=" (" suffix=")"/>
+              <substitute>
+                <names variable="editorial-director"/>
+                <names variable="collection-editor"/>
+                <names variable="container-author"/>
+              </substitute>
+            </names>
+            <group delimiter=": " font-style="italic">
+              <text variable="container-title"/>
+              <!-- Replace with volume-title as that becomes available -->
               <choose>
-                <if variable="editor translator" match="none">
-                  <choose>
-                    <if variable="collection-number">
-                      <group>
-                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                        <number variable="volume" form="numeric"/>
-                      </group>
-                    </if>
-                  </choose>
+                <if is-numeric="volume" match="none">
+                  <group delimiter=" ">
+                    <label variable="volume" form="short" text-case="capitalize-first"/>
+                    <text variable="volume"/>
+                  </group>
                 </if>
               </choose>
-            </else-if>
-            <else>
-              <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
-              </group>
-            </else>
+            </group>
+          </group>
+          <text macro="parenthetical-container"/>
+          <text macro="bracketed-container"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <choose>
+        <if type="thesis">
+          <choose>
+            <if variable="archive DOI URL" match="none">
+              <text variable="publisher"/>
+            </if>
           </choose>
         </if>
-        <else>
-          <group>
-            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+        <else-if type="post webpage">
+          <!-- For websites, treat container title like publisher -->
+          <group delimiter="; ">
+            <text variable="container-title" text-case="title"/>
+            <text variable="publisher"/>
           </group>
-        </else>
+        </else-if>
+        <else-if type="paper-conference">
+          <!-- For paper-conference, don't print publisher if in a journal-like proceedings -->
+          <choose>
+            <if variable="collection-editor editor editorial-director" match="any">
+              <text variable="publisher"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article-journal article-magazine article-newspaper post-weblog" match="none">
+          <text variable="publisher"/>
+        </else-if>
       </choose>
-      <group>
-        <label variable="page" form="short" suffix=" "/>
-        <text variable="page"/>
+      <group delimiter=", ">
+        <choose>
+          <if variable="archive-place">
+            <!-- With `archive-place`: physical archives. Without: online archives. -->
+            <!-- For physical archives, print the location before the archive name.
+                For electronic archives, these are printed in macro="description". -->
+            <!-- Split "archive_location" into "archive_collection" and "archive_location" as that becomes available -->
+            <!-- Must test for archive_collection:
+                With collection: archive_collection (archive_location), archive, archive-place
+                No collection: archive (archive_location), archive-place
+            -->
+            <text variable="archive_location"/>
+          </if>
+        </choose>
+        <text variable="archive"/>
+        <text variable="archive-place"/>
       </group>
     </group>
   </macro>
-  <macro name="container">
+  <macro name="access">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
-        <group delimiter=", ">
-          <text macro="container-title"/>
-          <text macro="locators"/>
+      <if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <choose>
+            <if variable="issued status" match="none">
+              <group delimiter=" ">
+                <text term="retrieved" text-case="capitalize-first"/>
+                <date variable="accessed" form="text" suffix=","/>
+                <text term="from"/>
+              </group>
+            </if>
+          </choose>
+          <text variable="URL"/>
         </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
-          <!--for advance online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <!-- Don't print event info if published in a proceedings -->
+            <group delimiter=", ">
+              <text variable="event"/>
+              <text variable="event-place"/>
+            </group>
           </if>
         </choose>
       </if>
-      <else-if type="article dataset figure" match="any">
-        <choose>
-          <if variable="container-title">
-            <group delimiter=", ">
-              <text macro="container-title"/>
-              <text macro="locators"/>
-            </group>
-            <choose>
-              <!--for advance online publication-->
-              <if variable="issued">
+    </choose>
+  </macro>
+  <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
+  <macro name="publication-history">
+    <choose>
+      <if type="patent" match="none">
+        <group prefix="(" suffix=")">
+          <choose>
+            <if variable="references">
+              <!-- This provides the option for more elaborate description 
+                    of publication history, such as full "reprinted" references
+                    (examples 11, 43, 44) or retracted references -->
+              <text variable="references"/>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text value="Original work published"/>
                 <choose>
-                  <if variable="page issue" match="none">
-                    <text variable="status" text-case="capitalize-first" prefix=". "/>
+                  <if is-uncertain-date="original-date">
+                    <text term="circa" form="short"/>
                   </if>
                 </choose>
-              </if>
-            </choose>
-          </if>
-        </choose>
-      </else-if>
-      <!-- book is here to catch software with container titles -->
-      <else-if type="book" variable="container-title" match="all">
-        <group delimiter=" ">
-          <text term="in" text-case="capitalize-first" suffix=" "/>
+                <date variable="original-date">
+                  <date-part name="year"/>
+                </date>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else>
+        <text variable="references" prefix="(" suffix=")"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- Legal citations have their own rules -->
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=". ">
           <group delimiter=", ">
-            <text macro="container-contributors"/>
+            <text variable="title"/>
             <group delimiter=" ">
-              <text macro="container-title"/>
-              <text macro="description-report" prefix="(" suffix=")"/>
-              <text macro="format-report" prefix="[" suffix="]"/>
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
             </group>
+            <text variable="references"/>
           </group>
+          <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="report" variable="container-title" match="all">
-        <group delimiter=" ">
-          <text term="in" text-case="capitalize-first" suffix=" "/>
+      </if>
+      <else-if type="bill">
+        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+        <group delimiter=". ">
           <group delimiter=", ">
-            <text macro="container-contributors"/>
+            <choose>
+              <if variable="number container-title" match="none">
+                <!-- If no number or container-title, then assume it is a hearing -->
+                <text variable="title" font-style="italic"/>
+              </if>
+              <else>
+                <text variable="title"/>
+              </else>
+            </choose>
             <group delimiter=" ">
-              <text macro="container-title"/>
-              <text macro="description-report" prefix="(" suffix=")"/>
-              <text macro="format-report" prefix="[" suffix="]"/>
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <choose>
+                <if variable="number container-title" match="none">
+                  <!-- If no number or container-title, then assume it is a hearing -->
+                  <names variable="author" prefix="(testimony of " suffix=")">
+                    <name and="symbol" delimiter=", "/>
+                  </names>
+                </if>
+                <else>
+                  <text variable="status" prefix="(" suffix=")"/>
+                </else>
+              </choose>
             </group>
+            <text variable="references"/>
           </group>
+          <text macro="access"/>
         </group>
       </else-if>
-      <else-if type="song" variable="container-title" match="all">
-        <group delimiter=" ">
-          <text term="in" text-case="capitalize-first" suffix=" "/>
+      <else-if type="legislation">
+        <!-- Currently designed to handle statutes, codified regulations, executive orders.
+              For uncodified regulations, assume future code section is in status. -->
+        <group delimiter=". ">
           <group delimiter=", ">
-            <text macro="container-contributors"/>
+            <text variable="title"/>
             <group delimiter=" ">
-              <text macro="container-title"/>
-              <text macro="locators" prefix="(" suffix=")"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="genre" text-case="capitalize-first"/>
-                <text variable="medium" text-case="capitalize-first"/>
-              </group>
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <text variable="status" prefix="(" suffix=")"/>
             </group>
+            <text variable="references"/>
           </group>
+          <text macro="access"/>
         </group>
       </else-if>
-      <else-if type="paper-conference">
-        <choose>
-          <if variable="editor collection-editor container-author" match="any">
-            <text macro="container-booklike"/>
-          </if>
-          <else>
-            <group delimiter=", ">
-              <text macro="container-title"/>
-              <text macro="locators"/>
-            </group>
-          </else>
-        </choose>
-      </else-if>
-      <else-if type="book">
-        <choose>
-          <!-- book and software should not cite collection-title, only container-title -->
-          <if variable="container-title">
-            <text macro="container-booklike"/>
-          </if>
-        </choose>
-      </else-if>
-      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
-        <text macro="container-booklike"/>
-      </else-if>
-      <else-if type="bill legal_case legislation treaty" match="any">
-        <text macro="legal-cites"/>
+      <else-if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+              explanation for treaty items. The Bluebook format that was used in APA 6th
+              ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
+          <text macro="access"/>
+        </group>
       </else-if>
     </choose>
   </macro>
-  <macro name="container-booklike">
+  <macro name="date-legal">
     <choose>
-      <if variable="container-title collection-title" match="any">
-        <group delimiter=" ">
-          <text term="in" text-case="capitalize-first"/>
-          <group delimiter=", ">
-            <text macro="container-contributors"/>
-            <choose>
-              <if variable="container-author editor translator" match="none">
-                <group delimiter=". ">
-                  <group delimiter=": ">
-                    <text variable="collection-title" font-style="italic" text-case="title"/>
-                    <choose>
-                      <if variable="collection-title">
-                        <group delimiter=" ">
-                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                          <number variable="collection-number" font-style="italic" form="numeric"/>
-                          <choose>
-                            <if variable="collection-number" match="none">
-                              <number variable="volume" font-style="italic" form="numeric"/>
-                            </if>
-                          </choose>
-                        </group>
-                      </if>
-                    </choose>
-                  </group>
-                  <!-- Replace with volume-title as that becomes available -->
-                  <group delimiter=": ">
-                    <text macro="container-title"/>
-                    <choose>
-                      <if variable="collection-title" is-numeric="volume" match="none">
-                        <group delimiter=" ">
-                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                          <text variable="volume" font-style="italic"/>
-                        </group>
-                      </if>
-                    </choose>
-                  </group>
-                </group>
-              </if>
-              <else>
-                <!-- Replace with volume-title as that becomes available -->
-                <group delimiter=": ">
-                  <text macro="container-title"/>
-                  <choose>
-                    <if is-numeric="volume" match="none">
-                      <group delimiter=" ">
-                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                        <text variable="volume" font-style="italic"/>
-                      </group>
-                    </if>
-                  </choose>
-                </group>
-              </else>
-            </choose>
-          </group>
-          <group delimiter="; " prefix="(" suffix=")">
-            <text macro="locators"/>
-            <names variable="container-author">
-              <label form="verb-short" suffix=" " text-case="title"/>
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-            </names>
-          </group>
+      <if type="legal_case">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <text variable="authority"/>
+          <choose>
+            <if variable="container-title" match="any">
+              <!-- Print only year for cases published in reporters-->
+              <date variable="issued" form="numeric" date-parts="year"/>
+            </if>
+            <else>
+              <date variable="issued" form="text"/>
+            </else>
+          </choose>
         </group>
       </if>
-    </choose>
-  </macro>
-  <macro name="container-title">
-    <choose>
-      <if type="article article-journal article-magazine article-newspaper dataset" match="any">
-        <text variable="container-title" font-style="italic" text-case="title"/>
-      </if>
-      <else-if type="paper-conference speech">
-        <choose>
-          <if variable="collection-editor container-author editor" match="any">
-            <text variable="container-title" font-style="italic"/>
-          </if>
-          <else>
-            <text variable="container-title" font-style="italic" text-case="title"/>
-          </else>
-        </choose>
+      <else-if type="bill legislation" match="any">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <group delimiter=" ">
+            <date variable="original-date">
+              <date-part name="year"/>
+            </date>
+            <text term="and" form="symbol"/>
+          </group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
       </else-if>
-      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
-        <text variable="container-title" font-style="italic"/>
+      <else-if type="treaty">
+        <date variable="issued" form="text"/>
       </else-if>
     </choose>
   </macro>
-  <macro name="legal-cites">
+  <macro name="container-legal">
+    <!-- Expect legal item container-titles to be stored in short form -->
     <choose>
       <if type="legal_case">
-        <group prefix=", " delimiter=" ">
-          <group delimiter=" ">
-            <choose>
-              <if variable="container-title">
+        <group delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <group delimiter=" ">
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!--change to label variable="section" as that becomes available -->
+                  <!-- Change to label variable="section" as that becomes available -->
                   <text term="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
-                <text variable="page"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <choose>
-                    <if is-numeric="number">
-                      <!-- Replace with term="number" if that becomes available -->
-                      <text term="issue" form="short" text-case="capitalize-first"/>
-                    </if>
-                  </choose>
-                  <text variable="number"/>
-                </group>
-              </else>
-            </choose>
-          </group>
-          <group prefix="(" suffix=")" delimiter=" ">
-            <text variable="authority"/>
-            <choose>
-              <if variable="container-title" match="any">
-                <!--Only print year for cases published in reporters-->
-                <date variable="issued" form="numeric" date-parts="year"/>
-              </if>
-              <else>
-                <date variable="issued" form="text"/>
-              </else>
-            </choose>
-          </group>
+                <choose>
+                  <if variable="page page-first" match="any">
+                    <text variable="page-first"/>
+                  </if>
+                  <else>
+                    <text value="___"/>
+                  </else>
+                </choose>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <choose>
+                  <if is-numeric="number">
+                    <!-- Replace with label variable="number" if that becomes available -->
+                    <text term="issue" form="short" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
-        <group prefix=", " delimiter=" ">
-          <group delimiter=", ">
-            <choose>
-              <if variable="number">
-                <!--There's a public law number-->
-                <text variable="number" prefix="Pub. L. No. "/>
-                <group delimiter=" ">
-                  <!--change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
-                  <text variable="section"/>
-                </group>
-                <group delimiter=" ">
-                  <text variable="volume"/>
-                  <text variable="container-title"/>
-                  <text variable="page-first"/>
-                </group>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="volume"/>
-                  <text variable="container-title"/>
-                  <!--change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
-                  <text variable="section"/>
-                </group>
-              </else>
-            </choose>
+      <else-if type="bill">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <group delimiter=" ">
+              <choose>
+                <if variable="chapter-number container-title" match="none">
+                  <!-- Replace with label variable="number" as that becomes available -->
+                  <text term="issue" form="short"/>
+                </if>
+              </choose>
+              <text variable="number"/>
+            </group>
+          </group>
+          <text variable="authority"/>
+          <text variable="chapter-number"/>
+          <group delimiter=" ">
+            <text variable="volume"/>
+            <text variable="container-title"/>
+            <text variable="page-first"/>
           </group>
-          <date variable="issued" prefix="(" suffix=")">
-            <date-part name="year"/>
-          </date>
         </group>
       </else-if>
+      <else-if type="legislation">
+        <choose>
+          <if variable="number">
+            <!--There's a public law number-->
+            <group delimiter=", ">
+              <text variable="number" prefix="Pub. L. No. "/>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <text variable="page-first"/>
+              </group>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="volume"/>
+              <text variable="container-title"/>
+              <choose>
+                <if variable="section">
+                  <group delimiter=" ">
+                    <!-- Change to label variable="section" as that becomes available -->
+                    <text term="section" form="symbol"/>
+                    <text variable="section"/>
+                  </group>
+                </if>
+                <else>
+                  <text variable="page-first"/>
+                </else>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else-if>
       <else-if type="treaty">
         <group delimiter=" ">
           <number variable="volume"/>
           <text variable="container-title"/>
-          <text variable="page"/>
+          <choose>
+            <if variable="page page-first" match="any">
+              <text variable="page-first"/>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <!-- Replace with label variable="number" if that becomes available -->
+                <text term="issue" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
         </group>
       </else-if>
     </choose>
   </macro>
-  <citation et-al-min="8" et-al-use-first="6" et-al-use-last="true" disambiguate-add-year-suffix="true">
+  <citation et-al-min="21" et-al-use-first="19" et-al-use-last="true">
     <sort>
-      <key macro="issued-sort" sort="descending"/>
-      <key macro="author"/>
+      <key macro="date-sort-group" sort="descending"/>
+      <key macro="date-sort-date" sort="descending"/>
+      <key variable="status"/>
+      <key macro="author-bib"/>
       <key macro="title"/>
     </sort>
-    <layout>
-      <group suffix=".">
-        <group delimiter=". ">
-          <text macro="author"/>
+    <layout delimiter="&#13;&#10;">
+      <choose>
+        <if type="bill legal_case legislation treaty" match="any">
+          <!-- Legal items have different orders and delimiters -->
           <choose>
-            <if is-uncertain-date="issued">
-              <group prefix=" [" suffix="]" delimiter=" ">
-                <text term="circa" form="short"/>
-                <text macro="issued"/>
-              </group>
+            <if variable="DOI URL" match="any">
+              <text macro="legal-cites"/>
             </if>
             <else>
-              <text macro="issued" prefix=" (" suffix=")"/>
+              <text macro="legal-cites" suffix="."/>
             </else>
           </choose>
-          <group delimiter=" ">
-            <text macro="title"/>
-            <choose>
-              <if variable="title interviewer" type="interview" match="any">
-                <group delimiter=" ">
-                  <text macro="description"/>
-                  <text macro="format"/>
-                </group>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text macro="format"/>
-                  <text macro="description"/>
-                </group>
-              </else>
-            </choose>
-          </group>
-          <text macro="container"/>
-        </group>
-        <text macro="event" prefix=". "/>
-      </group>
-      <text macro="access" prefix=" "/>
-      <choose>
-        <if is-uncertain-date="original-date">
-          <group prefix=" [" suffix="]" delimiter=" ">
-            <text macro="original-published"/>
-            <text term="circa" form="short"/>
-            <text macro="original-date"/>
-          </group>
         </if>
-        <else-if variable="original-date">
-          <group prefix=" (" suffix=")" delimiter=" ">
-            <text macro="original-published"/>
-            <text macro="original-date"/>
+        <else>
+          <group delimiter=" ">
+            <group delimiter=". " suffix=".">
+              <text macro="author-bib"/>
+              <text macro="date-bib"/>
+              <text macro="title-and-descriptions"/>
+              <text macro="container"/>
+              <text macro="event"/>
+              <text macro="publisher"/>
+            </group>
+            <text macro="access"/>
+            <text macro="publication-history"/>
           </group>
-        </else-if>
+        </else>
       </choose>
       <text variable="annote" display="block"/>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2">
+  <bibliography hanging-indent="true" et-al-min="21" et-al-use-first="19" et-al-use-last="true" entry-spacing="0" line-spacing="2">
     <sort>
-      <key macro="issued-sort" sort="descending"/>
-      <key macro="author"/>
+      <key macro="date-sort-group" sort="descending"/>
+      <key macro="date-sort-date" sort="descending"/>
+      <key variable="status"/>
+      <key macro="author-bib"/>
       <key macro="title"/>
     </sort>
     <layout>
-      <group suffix=".">
-        <group delimiter=". ">
-          <text macro="author"/>
+      <choose>
+        <if type="bill legal_case legislation treaty" match="any">
+          <!-- Legal items have different orders and delimiters -->
           <choose>
-            <if is-uncertain-date="issued">
-              <group prefix=" [" suffix="]" delimiter=" ">
-                <text term="circa" form="short"/>
-                <text macro="issued"/>
-              </group>
+            <if variable="DOI URL" match="any">
+              <text macro="legal-cites"/>
             </if>
             <else>
-              <text macro="issued" prefix=" (" suffix=")"/>
+              <text macro="legal-cites" suffix="."/>
             </else>
           </choose>
-          <group delimiter=" ">
-            <text macro="title"/>
-            <choose>
-              <if variable="title interviewer" type="interview" match="any">
-                <group delimiter=" ">
-                  <text macro="description"/>
-                  <text macro="format"/>
-                </group>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text macro="format"/>
-                  <text macro="description"/>
-                </group>
-              </else>
-            </choose>
-          </group>
-          <text macro="container"/>
-        </group>
-        <text macro="event" prefix=". "/>
-      </group>
-      <text macro="access" prefix=" "/>
-      <choose>
-        <if is-uncertain-date="original-date">
-          <group prefix=" [" suffix="]" delimiter=" ">
-            <text macro="original-published"/>
-            <text term="circa" form="short"/>
-            <text macro="original-date"/>
-          </group>
         </if>
-        <else-if variable="original-date">
-          <group prefix=" (" suffix=")" delimiter=" ">
-            <text macro="original-published"/>
-            <text macro="original-date"/>
+        <else>
+          <group delimiter=" ">
+            <group delimiter=". " suffix=".">
+              <text macro="author-bib"/>
+              <text macro="date-bib"/>
+              <text macro="title-and-descriptions"/>
+              <text macro="container"/>
+              <text macro="event"/>
+              <text macro="publisher"/>
+            </group>
+            <text macro="access"/>
+            <text macro="publication-history"/>
           </group>
-        </else-if>
+        </else>
       </choose>
       <text variable="annote" display="block"/>
     </layout>
diff --git a/apa-no-ampersand.csl b/apa-no-ampersand.csl
index 3797a3ed0a6c..aa5da5097aa9 100644
--- a/apa-no-ampersand.csl
+++ b/apa-no-ampersand.csl
@@ -1,39 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
   <info>
-    <title>American Psychological Association 6th edition (no ampersand)</title>
-    <title-short>APA</title-short>
+    <title>American Psychological Association 7th edition (no ampersand)</title>
+    <title-short>APA (no ampersand)</title-short>
     <id>http://www.zotero.org/styles/apa-no-ampersand</id>
     <link href="http://www.zotero.org/styles/apa-no-ampersand" rel="self"/>
     <link href="http://www.zotero.org/styles/apa" rel="template"/>
-    <link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
-    <link href="http://biblioteca.blanquerna.edu/ca/com-trobar-informaci%C3%B3/com-citar/american-psicological-association-apa" rel="documentation"/>
+    <link href="https://apastyle.apa.org/style-grammar-guidelines/references/examples" rel="documentation"/>
     <author>
-      <name>Simon Kornblith</name>
-      <email>simon@simonster.com</email>
-    </author>
-    <author>
-      <name> Brenton M. Wiernik</name>
+      <name>Brenton M. Wiernik</name>
       <email>zotero@wiernik.org</email>
     </author>
-    <contributor>
-      <name>Bruce D'Arcus</name>
-    </contributor>
-    <contributor>
-      <name>Curtis M. Humphrey</name>
-    </contributor>
-    <contributor>
-      <name>Richard Karnesky</name>
-      <email>karnesky+zotero@gmail.com</email>
-      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
-    </contributor>
-    <contributor>
-      <name>Sebastian Karcher</name>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <updated>2016-09-28T13:09:49+00:00</updated>
+    <updated>2019-12-04T13:09:49+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -43,14 +24,28 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
-      <term name="interviewer" form="short">interviewer</term>
+      <term name="interviewer" form="short">
+        <single>interviewer</single>
+        <multiple>interviewers</multiple>
+      </term>
+      <term name="collection-editor" form="short">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
       <term name="circa" form="short">ca.</term>
-      <term name="collection-editor" form="short">series ed.</term>
+      <term name="bc"> B.C.E.</term>
+      <term name="ad"> C.E.</term>
+      <term name="letter">personal communication</term>
+      <term name="letter" form="short">letter</term>
+      <term name="issue" form="long">
+        <single>issue</single>
+        <multiple>issues</multiple>
+      </term>
     </terms>
   </locale>
-  <locale xml:lang="es">
+  <locale xml:lang="da">
     <terms>
-      <term name="from">de</term>
+      <term name="et-al">et al.</term>
     </terms>
   </locale>
   <locale xml:lang="de">
@@ -58,1471 +53,1615 @@
       <term name="et-al">et al.</term>
     </terms>
   </locale>
-  <locale xml:lang="da">
+  <locale xml:lang="es">
     <terms>
-      <term name="et-al">et al.</term>
+      <term name="from">de</term>
     </terms>
   </locale>
-  <locale xml:lang="nn">
+  <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
     </terms>
   </locale>
-  <locale xml:lang="nb">
+  <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
     </terms>
   </locale>
-  <macro name="container-contributors-booklike">
-    <choose>
-      <if variable="container-title">
-        <names variable="editor translator" delimiter=", &amp; ">
-          <name and="text" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          <substitute>
-            <names variable="editorial-director"/>
-            <names variable="collection-editor"/>
-            <names variable="container-author"/>
-          </substitute>
-        </names>
-      </if>
-    </choose>
-  </macro>
-  <macro name="container-contributors">
-    <choose>
-      <!-- book is here to catch software with container titles -->
-      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
-        <text macro="container-contributors-booklike"/>
-      </if>
-      <else-if type="paper-conference">
-        <choose>
-          <if variable="collection-editor container-author editor" match="any">
-            <text macro="container-contributors-booklike"/>
-          </if>
-        </choose>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="secondary-contributors-booklike">
-    <group delimiter="; ">
-      <choose>
-        <if variable="title">
-          <names variable="interviewer">
-            <name and="text" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-        </if>
-      </choose>
-      <choose>
-        <if variable="container-title" match="none">
-          <group delimiter="; ">
-            <names variable="container-author">
-              <label form="verb-short" suffix=" " text-case="title"/>
-              <name and="text" initialize-with=". " delimiter=", "/>
-            </names>
-            <names variable="editor translator" delimiter="; ">
-              <name and="text" initialize-with=". " delimiter=", "/>
-              <label form="short" prefix=", " text-case="title"/>
-            </names>
-          </group>
-        </if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="secondary-contributors">
-    <choose>
-      <!-- book is here to catch software with container titles -->
-      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
-        <text macro="secondary-contributors-booklike"/>
-      </if>
-      <else-if type="personal_communication">
-        <group delimiter="; ">
-          <group delimiter=" ">
-            <choose>
-              <if variable="genre" match="any">
-                <text variable="genre" text-case="capitalize-first"/>
-              </if>
-              <else>
-                <text term="letter" text-case="capitalize-first"/>
-              </else>
-            </choose>
-            <names variable="recipient" delimiter=", ">
-              <label form="verb" suffix=" "/>
-              <name and="text" delimiter=", "/>
-            </names>
-          </group>
-          <text variable="medium" text-case="capitalize-first"/>
-          <choose>
-            <if variable="container-title" match="none">
-              <names variable="editor translator" delimiter="; ">
-                <name and="text" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </if>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="song">
-        <choose>
-          <if variable="original-author composer" match="any">
-            <group delimiter="; ">
-              <!-- Replace prefix with performer label as that becomes available -->
-              <names variable="author" prefix="Recorded by ">
-                <label form="verb" text-case="title"/>
-                <name and="text" initialize-with=". " delimiter=", "/>
-              </names>
-              <names variable="translator">
-                <name and="text" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </group>
-          </if>
-        </choose>
-      </else-if>
-      <else-if type="article-journal article-magazine article-newspaper" match="any">
-        <group delimiter="; ">
-          <choose>
-            <if variable="title">
-              <names variable="interviewer" delimiter="; ">
-                <name and="text" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </if>
-          </choose>
-          <names variable="translator" delimiter="; ">
-            <name and="text" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-        </group>
-      </else-if>
-      <else-if type="paper-conference">
-        <choose>
-          <if variable="collection-editor editor" match="any">
-            <text macro="secondary-contributors-booklike"/>
-          </if>
-          <else>
-            <group delimiter="; ">
-              <choose>
-                <if variable="title">
-                  <names variable="interviewer" delimiter="; ">
-                    <name and="text" initialize-with=". " delimiter=", "/>
-                    <label form="short" prefix=", " text-case="title"/>
-                  </names>
-                </if>
-              </choose>
-              <names variable="translator" delimiter="; ">
-                <name and="text" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </group>
-          </else>
-        </choose>
-      </else-if>
-      <else>
-        <group delimiter="; ">
-          <choose>
-            <if variable="title">
-              <names variable="interviewer">
-                <name and="text" initialize-with=". " delimiter="; "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </if>
-          </choose>
-          <names variable="editor translator" delimiter="; ">
-            <name and="text" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="author">
-    <choose>
-      <if type="song">
-        <names variable="composer" delimiter=", ">
+  <!-- General categories of item types:
+        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
+        Periodical or Booklike: paper-conference
+        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
+                  graphic interview manuscript map motion_picture musical_score pamphlet patent 
+                  personal_communication report song speech thesis post webpage
+        Legal: bill legal_case legislation treaty
+  -->
+  <!-- APA references contain four parts: author, date, title, source -->
+  <macro name="author-bib">
+    <names variable="composer" delimiter=", ">
+      <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <substitute>
+        <names variable="author"/>
+        <names variable="illustrator"/>
+        <names variable="director">
           <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-          <substitute>
-            <names variable="original-author"/>
-            <names variable="author"/>
-            <names variable="translator">
-              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <group delimiter=" ">
-              <text macro="title"/>
-              <text macro="description"/>
-              <text macro="format"/>
-            </group>
-          </substitute>
+          <label form="long" prefix=" (" suffix=")" text-case="title"/>
         </names>
-      </if>
-      <else-if type="treaty"/>
-      <else>
-        <names variable="author" delimiter=", ">
-          <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-          <substitute>
-            <names variable="illustrator"/>
-            <names variable="composer"/>
-            <names variable="director">
-              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="long" prefix=" (" suffix=")" text-case="title"/>
-            </names>
+        <choose>
+          <if variable="container-title">
             <choose>
-              <if variable="container-title">
+              <if type="book entry entry-dictionary entry-encyclopedia" match="any">
                 <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia">
-                    <text macro="title"/>
+                  <if variable="title">
+                    <group delimiter=" ">
+                      <text macro="title"/>
+                      <text macro="parenthetical"/>
+                    </group>
                   </if>
                   <else>
-                    <names variable="translator"/>
+                    <text macro="title-and-descriptions"/>
                   </else>
                 </choose>
-                <names variable="translator">
-                  <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-                  <label form="short" prefix=" (" suffix=")" text-case="title"/>
-                </names>
-              </if>
-            </choose>
-            <names variable="editor translator" delimiter=", ">
-              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <names variable="editorial-director">
-              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <names variable="collection-editor">
-              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <choose>
-              <if type="report">
-                <text variable="publisher"/>
               </if>
             </choose>
+          </if>
+        </choose>
+        <!-- Test for editortranslator and put that first as that becomes available -->
+        <names variable="editor" delimiter=", ">
+          <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="editorial-director">
+          <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="collection-editor">
+          <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <choose>
+          <if variable="title">
             <group delimiter=" ">
               <text macro="title"/>
-              <text macro="description"/>
-              <text macro="format"/>
+              <text macro="parenthetical"/>
             </group>
-          </substitute>
-        </names>
-      </else>
-    </choose>
+          </if>
+          <else>
+            <text macro="title-and-descriptions"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
   </macro>
-  <macro name="author-short">
+  <macro name="author-intext">
     <choose>
-      <if type="patent" variable="number" match="all">
-        <text macro="patent-number"/>
+      <if type="bill legal_case legislation treaty" match="any">
+        <text macro="title-intext"/>
       </if>
-      <else-if type="treaty">
-        <text variable="title" form="short"/>
-      </else-if>
-      <else-if type="personal_communication">
+      <else-if type="interview personal_communication">
         <choose>
-          <if variable="archive DOI publisher URL" match="none">
+          <!-- These variables indicate that the letter is retrievable by the reader. 
+                If not, then use the APA in-text-only personal communication format -->
+          <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
               <names variable="author">
                 <name and="text" delimiter=", " initialize-with=". "/>
                 <substitute>
-                  <text variable="title" form="short" quotes="true"/>
+                  <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- This should be localized -->
-              <text value="personal communication"/>
+              <!-- Replace with term="personal-communication" if that becomes available -->
+              <text term="letter"/>
             </group>
           </if>
           <else>
             <names variable="author" delimiter=", ">
               <name form="short" and="text" delimiter=", " initialize-with=". "/>
               <substitute>
-                <names variable="editor"/>
-                <names variable="translator"/>
-                <choose>
-                  <if variable="container-title">
-                    <text variable="title" form="short" quotes="true"/>
-                  </if>
-                  <else>
-                    <text variable="title" form="short" font-style="italic"/>
-                  </else>
-                </choose>
-                <text macro="format-short" prefix="[" suffix="]"/>
+                <text macro="title-intext"/>
               </substitute>
             </names>
           </else>
         </choose>
       </else-if>
-      <else-if type="song">
+      <else>
         <names variable="composer" delimiter=", ">
           <name form="short" and="text" delimiter=", " initialize-with=". "/>
           <substitute>
-            <names variable="original-author"/>
             <names variable="author"/>
-            <names variable="translator"/>
-            <choose>
-              <if variable="container-title">
-                <text variable="title" form="short" quotes="true"/>
-              </if>
-              <else>
-                <text variable="title" form="short" font-style="italic"/>
-              </else>
-            </choose>
-            <text macro="format-short" prefix="[" suffix="]"/>
-          </substitute>
-        </names>
-      </else-if>
-      <else>
-        <names variable="author" delimiter=", ">
-          <name form="short" and="text" delimiter=", " initialize-with=". "/>
-          <substitute>
             <names variable="illustrator"/>
-            <names variable="composer"/>
             <names variable="director"/>
             <choose>
               <if variable="container-title">
                 <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia">
-                    <text variable="title" form="short" quotes="true"/>
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
+                    <text macro="title-intext"/>
                   </if>
-                  <else>
-                    <names variable="translator"/>
-                  </else>
                 </choose>
               </if>
             </choose>
             <names variable="editor"/>
             <names variable="editorial-director"/>
-            <names variable="translator"/>
-            <choose>
-              <if type="report" variable="publisher" match="all">
-                <text variable="publisher"/>
-              </if>
-              <else-if type="legal_case">
-                <text variable="title" font-style="italic"/>
-              </else-if>
-              <else-if type="bill legislation" match="any">
-                <text variable="title" form="short"/>
-              </else-if>
-              <else-if variable="reviewed-author" type="review review-book" match="any">
-                <text macro="format-short" prefix="[" suffix="]"/>
-              </else-if>
-              <else-if type="post post-weblog webpage" variable="container-title" match="any">
-                <text variable="title" form="short" quotes="true"/>
-              </else-if>
-              <else>
-                <text variable="title" form="short" font-style="italic"/>
-              </else>
-            </choose>
-            <text macro="format-short" prefix="[" suffix="]"/>
+            <text macro="title-intext"/>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
-  <macro name="patent-number">
-    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
-    <group delimiter=" ">
-      <text variable="authority"/>
+  <macro name="date-bib">
+    <group delimiter=" " prefix="(" suffix=")">
       <choose>
-        <if variable="genre">
-          <text variable="genre" text-case="capitalize-first"/>
+        <if is-uncertain-date="issued">
+          <text term="circa" form="short"/>
         </if>
-        <else>
-          <!-- This should be localized -->
-          <text value="patent" text-case="capitalize-first"/>
-        </else>
       </choose>
-      <group delimiter=" ">
-        <text term="issue" form="short" text-case="capitalize-first"/>
-        <text variable="number"/>
-      </group>
-    </group>
-  </macro>
-  <macro name="access">
-    <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if variable="DOI" match="any">
-        <text variable="DOI" prefix="https://doi.org/"/>
-      </else-if>
-      <else-if variable="URL">
-        <group delimiter=" ">
-          <text term="retrieved" text-case="capitalize-first"/>
-          <choose>
-            <if type="post post-weblog webpage" match="any">
-              <date variable="accessed" form="text" suffix=","/>
-            </if>
-          </choose>
-          <text term="from"/>
-          <choose>
-            <if type="report">
-              <choose>
-                <if variable="author editor translator" match="any">
-                  <!-- This should be localized -->
-                  <text variable="publisher" suffix=" website:"/>
-                </if>
-              </choose>
-            </if>
-            <else-if type="post post-weblog webpage" match="any">
-              <!-- This should be localized -->
-              <text variable="container-title" suffix=" website:"/>
-            </else-if>
-          </choose>
-          <text variable="URL"/>
-        </group>
-      </else-if>
-      <else-if variable="archive">
+      <group>
         <choose>
-          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
-            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
+          <if variable="issued">
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+            <text variable="year-suffix"/>
             <choose>
-              <if variable="archive-place" match="none">
-                <group delimiter=" ">
-                  <text term="retrieved" text-case="capitalize-first"/>
-                  <text term="from"/>
-                  <text variable="archive" suffix="."/>
-                  <text variable="archive_location" prefix="(" suffix=")"/>
-                </group>
+              <if type="article-magazine article-newspaper broadcast interview motion_picture pamphlet personal_communication post post-weblog song speech webpage" match="any">
+                <!-- Many video and audio examples in manual give full dates. Err on the side of too much information. -->
+                <date variable="issued">
+                  <date-part prefix=", " name="month"/>
+                  <date-part prefix=" " name="day"/>
+                </date>
               </if>
-              <else>
-                <text macro="publisher" suffix="."/>
-              </else>
+              <else-if type="paper-conference">
+                <!-- Capture 'speech' stored as 'paper-conference' -->
+                <choose>
+                  <if variable="collection-editor editor editorial-director issue page volume" match="none">
+                    <date variable="issued">
+                      <date-part prefix=", " name="month"/>
+                      <date-part prefix=" " name="day"/>
+                    </date>
+                  </if>
+                </choose>
+              </else-if>
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
+          <else-if variable="status">
+            <group>
+              <text variable="status" text-case="lowercase"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
+          </else-if>
           <else>
-            <text macro="publisher" suffix="."/>
+            <group>
+              <text term="no date" form="short"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
           </else>
         </choose>
-      </else-if>
-      <else>
-        <text macro="publisher" suffix="."/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="title">
+      </group>
+    </group>
+  </macro>
+  <macro name="date-sort-group">
     <choose>
-      <if type="treaty">
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
+      <if variable="issued">
+        <text value="1"/>
+      </if>
+      <else-if variable="status">
+        <text value="2"/>
+      </else-if>
+      <else>
+        <text value="0"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-sort-date">
+    <choose>
+      <if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
+        <date variable="issued" form="numeric"/>
+      </if>
+      <else-if type="paper-conference">
+        <!-- Capture 'speech' stored as 'paper-conference' -->
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <date variable="issued" form="numeric"/>
+          </if>
+        </choose>
+      </else-if>
+      <else>
+        <date variable="issued" form="numeric"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-intext">
+    <choose>
+      <if variable="issued">
+        <group delimiter="/">
+          <group delimiter=" ">
+            <choose>
+              <if is-uncertain-date="original-date">
+                <text term="circa" form="short"/>
+              </if>
+            </choose>
+            <date variable="original-date">
+              <date-part name="year"/>
+            </date>
+          </group>
+          <group delimiter=" ">
+            <choose>
+              <if is-uncertain-date="issued">
+                <text term="circa" form="short"/>
+              </if>
+            </choose>
+            <group>
+              <choose>
+                <if type="interview personal_communication">
+                  <choose>
+                    <if variable="archive container-title DOI publisher URL" match="none">
+                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                            If not, then use the in-text-only personal communication format -->
+                      <date variable="issued" form="text"/>
+                    </if>
+                    <else>
+                      <date variable="issued">
+                        <date-part name="year"/>
+                      </date>
+                    </else>
+                  </choose>
+                </if>
+                <else>
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                </else>
+              </choose>
+              <text variable="year-suffix"/>
+            </group>
+          </group>
         </group>
       </if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
+      <else-if variable="status">
+        <text variable="status" text-case="lowercase"/>
+        <text variable="year-suffix" prefix="-"/>
       </else-if>
-      <else-if variable="title">
+      <else>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- APA has two description elements following the title:
+        title (parenthetical) [bracketed]  -->
+  <macro name="title-and-descriptions">
+    <choose>
+      <if variable="title">
+        <group delimiter=" ">
+          <text macro="title"/>
+          <text macro="parenthetical"/>
+          <text macro="bracketed"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <text macro="bracketed"/>
+          <text macro="parenthetical"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="post webpage" match="any">
+        <!-- Webpages are always italicized -->
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else-if variable="container-title" match="any">
+        <!-- Other types are italicized based on presence of container-title.
+              Assume that review and review-book are published in periodicals/blogs,
+              not just on a web page (ex. 69) -->
+        <text variable="title"/>
+      </else-if>
+      <else>
         <choose>
-          <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a software type -->
-            <text variable="title"/>
+          <if type="article-journal article-magazine article-newspaper post-weblog review review-book">
+            <text variable="title" font-style="italic"/>
           </if>
-          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <else-if type="paper-conference">
             <choose>
-              <if variable="reviewed-title">
-                <choose>
-                  <if type="post post-weblog webpage" variable="container-title" match="any">
-                    <text variable="title"/>
-                  </if>
-                  <else>
-                    <text variable="title" font-style="italic"/>
-                  </else>
-                </choose>
+              <if variable="collection-editor editor editorial-director" match="any">
+                <group delimiter=": " font-style="italic">
+                  <text variable="title"/>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <label variable="volume" form="short" text-case="capitalize-first"/>
+                        <text variable="volume"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
               </if>
+              <else>
+                <text variable="title" font-style="italic"/>
+              </else>
             </choose>
           </else-if>
-          <else-if type="post post-weblog webpage" variable="container-title" match="any">
-            <text variable="title"/>
+          <else>
+            <group delimiter=": " font-style="italic">
+              <text variable="title"/>
+              <!-- Replace with volume-title as that becomes available -->
+              <choose>
+                <if is-numeric="volume" match="none">
+                  <group delimiter=" ">
+                    <label variable="volume" form="short" text-case="capitalize-first"/>
+                    <text variable="volume"/>
+                  </group>
+                </if>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-intext">
+    <choose>
+      <if variable="title" match="none">
+        <text macro="bracketed-intext" prefix="[" suffix="]"/>
+      </if>
+      <else-if type="bill">
+        <!-- If a bill has no number or container-title, assume it is a hearing; italic and title case -->
+        <choose>
+          <if variable="number container-title" match="none">
+            <text variable="title" form="short" font-style="italic" text-case="title"/>
+          </if>
+          <else-if variable="title">
+            <text variable="title" form="short"/>
           </else-if>
           <else>
-            <text variable="title" font-style="italic"/>
+            <group delimiter=" ">
+              <text variable="genre"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="chapter-number container-title" match="none">
+                    <!-- Replace with label variable="number" as that becomes available -->
+                    <text term="issue" form="short"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </group>
           </else>
         </choose>
       </else-if>
-      <else-if variable="interviewer" type="interview" match="any">
-        <names variable="interviewer">
-          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
-          <name and="text" initialize-with=". " delimiter=", "/>
-        </names>
+      <else-if type="legal_case" match="any">
+        <!-- Cases are italicized -->
+        <text variable="title" font-style="italic"/>
       </else-if>
+      <else-if type="legislation treaty" match="any">
+        <!-- Legislation and treaties not italicized or quoted -->
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="post webpage" match="any">
+        <!-- Webpages are always italicized -->
+        <text variable="title" form="short" font-style="italic"/>
+      </else-if>
+      <else-if variable="container-title" match="any">
+        <!-- Other types are italicized or quoted based on presence of container-title. As in title macro. -->
+        <text variable="title" form="short" quotes="true"/>
+      </else-if>
+      <else>
+        <text variable="title" form="short" font-style="italic"/>
+      </else>
     </choose>
   </macro>
-  <!-- APA has four descriptive sections following the title: -->
-  <!-- (description), [format], container, event -->
-  <macro name="description">
+  <macro name="parenthetical">
+    <!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->
     <group prefix="(" suffix=")">
       <choose>
-        <!-- book is here to catch software with container titles -->
-        <if type="book report" match="any">
+        <if type="patent">
+          <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
+          <group delimiter=" ">
+            <text variable="authority" form="short"/>
+            <choose>
+              <if variable="genre">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <text value="patent" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <group delimiter=" ">
+              <!-- Replace with label variable="number" if that becomes available -->
+              <text term="issue" form="short" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </group>
+        </if>
+        <else-if type="post webpage">
+          <!-- For post webpage, container-title is treated as publisher -->
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <text macro="database-location"/>
+            <text macro="number"/>
+            <text macro="locators-booklike"/>
+          </group>
+        </else-if>
+        <else-if variable="container-title">
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <choose>
+              <if type="broadcast graphic map motion_picture song" match="any">
+                <!-- For audiovisual media, number information comes after title, not container-title -->
+                <text macro="number"/>
+              </if>
+            </choose>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <text macro="database-location"/>
+            <text macro="number"/>
+            <text macro="locators-booklike"/>
+          </group>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="parenthetical-container">
+    <choose>
+      <if variable="container-title" match="any">
+        <group prefix="(" suffix=")">
+          <group delimiter="; ">
+            <text macro="database-location"/>
+            <choose>
+              <if type="broadcast graphic map motion_picture song" match="none">
+                <!-- For audiovisual media, number information comes after title, not container-title -->
+                <text macro="number"/>
+              </if>
+            </choose>
+            <text macro="locators-booklike"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="bracketed">
+    <!-- [Descriptive information] -->
+    <!-- If there is a number, genre is already printed in macro="number" -->
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <!-- Reviewed item -->
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <!-- Assume that genre is entered as 'Review of the book' or similar -->
+                <choose>
+                  <if variable="number" match="none">
+                    <choose>
+                      <if variable="genre">
+                        <text variable="genre" text-case="capitalize-first"/>
+                      </if>
+                      <else-if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </else-if>
+                      <else>
+                        <!-- Replace with term="review" as that becomes available -->
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </if>
+                  <else>
+                    <choose>
+                      <if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                      <else>
+                        <!-- Replace with term="review" as that becomes available -->
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </else>
+                </choose>
+                <text macro="reviewed-title"/>
+              </group>
+              <names variable="reviewed-author">
+                <label form="verb-short" suffix=" "/>
+                <name and="text" initialize-with=". " delimiter=", "/>
+              </names>
+            </group>
+            <choose>
+              <if variable="genre" match="any">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </group>
+        </if>
+        <else-if type="thesis">
+          <!-- Thesis type and institution -->
+          <group delimiter="; ">
+            <choose>
+              <if variable="number" match="none">
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="archive DOI URL" match="any">
+                      <!-- Include the university in brackets if thesis is published -->
+                      <text variable="publisher"/>
+                    </if>
+                  </choose>
+                </group>
+              </if>
+            </choose>
+            <text variable="medium" text-case="capitalize-first"/>
+          </group>
+        </else-if>
+        <else-if variable="interviewer" type="interview" match="any">
+          <!-- Interview information -->
           <choose>
-            <if variable="container-title">
-              <text macro="secondary-contributors"/>
+            <if variable="title">
+              <text macro="format"/>
             </if>
+            <else-if variable="genre">
+              <group delimiter="; ">
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <group delimiter=" ">
+                    <text term="author" form="verb"/>
+                    <names variable="interviewer">
+                      <name and="text" initialize-with=". " delimiter=", "/>
+                    </names>
+                  </group>
+                </group>
+              </group>
+            </else-if>
+            <else-if variable="interviewer">
+              <group delimiter="; ">
+                <names variable="interviewer">
+                  <label form="verb" suffix=" " text-case="capitalize-first"/>
+                  <name and="text" initialize-with=". " delimiter=", "/>
+                </names>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </else-if>
             <else>
+              <text macro="format"/>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="personal_communication">
+          <!-- Letter information -->
+          <choose>
+            <if variable="recipient">
               <group delimiter="; ">
-                <text macro="description-report"/>
-                <text macro="secondary-contributors"/>
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="number" match="none">
+                      <choose>
+                        <if variable="genre">
+                          <text variable="genre" text-case="capitalize-first"/>
+                        </if>
+                        <else-if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </else-if>
+                        <else>
+                          <text term="letter" form="short" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </if>
+                    <else>
+                      <choose>
+                        <if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </if>
+                        <else>
+                          <text term="letter" form="short" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </else>
+                  </choose>
+                  <names variable="recipient" delimiter=", ">
+                    <label form="verb" suffix=" "/>
+                    <name and="text" delimiter=", "/>
+                  </names>
+                </group>
+                <choose>
+                  <if variable="genre" match="any">
+                    <choose>
+                      <if variable="number" match="none">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                    </choose>
+                  </if>
+                </choose>
               </group>
+            </if>
+            <else>
+              <text macro="format"/>
             </else>
           </choose>
-        </if>
-        <else-if type="thesis">
-          <group delimiter="; ">
-            <group delimiter=", ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <choose>
-                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
-                <if variable="DOI URL archive" match="any">
-                  <text variable="publisher"/>
-                </if>
-              </choose>
-            </group>
-            <text macro="locators"/>
-            <text macro="secondary-contributors"/>
-          </group>
         </else-if>
-        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+        <else-if variable="composer" type="song" match="all">
+          <!-- Performer of classical music works -->
           <group delimiter="; ">
-            <text macro="locators"/>
-            <text macro="secondary-contributors"/>
+            <choose>
+              <if variable="number" match="none">
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="genre">
+                      <text variable="genre" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="text" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </if>
+                    <else-if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="text" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else-if>
+                    <else>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="text" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="text" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </if>
+                    <else>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="text" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <choose>
+              <if variable="genre" match="any">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
           </group>
         </else-if>
-        <else-if type="song">
+        <else-if variable="container-title" match="none">
+          <!-- Other description -->
+          <text macro="format"/>
+        </else-if>
+        <else>
+          <!-- For conference presentations, chapters in reports, software, place bracketed after the container title -->
           <choose>
-            <if variable="container-title" match="none">
-              <text macro="locators"/>
+            <if type="paper-conference speech" match="any">
+              <choose>
+                <if variable="collection-editor editor editorial-director issue page volume" match="any">
+                  <text macro="format"/>
+                </if>
+              </choose>
             </if>
+            <else-if type="book">
+              <choose>
+                <if variable="version" match="none">
+                  <text macro="format"/>
+                </if>
+              </choose>
+            </else-if>
+            <else-if type="report" match="none">
+              <text macro="format"/>
+            </else-if>
           </choose>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="bracketed-intext">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <!-- This should be localized -->
+          <text macro="reviewed-title-intext" prefix="Review of "/>
+        </if>
+        <else-if variable="interviewer" type="interview" match="any">
+          <names variable="interviewer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize-with=". " delimiter=", "/>
+            <substitute>
+              <text macro="format-intext"/>
+            </substitute>
+          </names>
         </else-if>
-        <else-if type="article dataset figure" match="any">
+        <else-if type="personal_communication">
+          <!-- Letter information -->
           <choose>
-            <if variable="container-title">
-              <text macro="secondary-contributors"/>
+            <if variable="recipient">
+              <group delimiter=" ">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="genre" text-case="capitalize-first"/>
+                  </if>
+                  <else>
+                    <text term="letter" form="short" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <names variable="recipient" delimiter=", ">
+                  <label form="verb" suffix=" "/>
+                  <name and="text" delimiter=", "/>
+                </names>
+              </group>
             </if>
             <else>
-              <group delimiter="; ">
-                <text macro="locators"/>
-                <text macro="secondary-contributors"/>
-              </group>
+              <text macro="format-intext"/>
             </else>
           </choose>
         </else-if>
-        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
-          <text macro="secondary-contributors"/>
-        </else-if>
+        <else>
+          <text macro="format-intext"/>
+        </else>
       </choose>
     </group>
   </macro>
-  <macro name="format">
+  <macro name="bracketed-container">
     <group prefix="[" suffix="]">
       <choose>
-        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <group delimiter=", ">
-            <choose>
-              <if variable="genre">
-                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
-                <group delimiter=", ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <choose>
-                    <if variable="reviewed-title">
-                      <text variable="reviewed-title" font-style="italic"/>
-                    </if>
-                    <else>
-                      <!-- Assume `title` is title of reviewed work -->
-                      <text variable="title" font-style="italic"/>
-                    </else>
-                  </choose>
-                </group>
-              </if>
-              <else>
-                <!-- This should be localized -->
-                <group delimiter=" ">
-                  <text value="Review of"/>
-                  <choose>
-                    <if variable="reviewed-title">
-                      <text variable="reviewed-title" font-style="italic"/>
-                    </if>
-                    <else>
-                      <!-- Assume `title` is title of reviewed work -->
-                      <text variable="title" font-style="italic"/>
-                    </else>
-                  </choose>
-                </group>
-              </else>
-            </choose>
-            <names variable="reviewed-author">
-              <label form="verb-short" suffix=" "/>
-              <name and="text" initialize-with=". " delimiter=", "/>
-            </names>
-          </group>
+        <if type="paper-conference speech" match="any">
+          <!-- Conference presentations should describe the session [container] in bracketed unless published in a proceedings -->
+          <choose>
+            <if variable="collection-editor editor editorial-director issue page volume" match="none">
+              <text macro="format"/>
+            </if>
+          </choose>
         </if>
-        <else>
-          <text macro="format-short"/>
-        </else>
+        <else-if type="book" variable="version" match="all">
+          <!-- For entries in mobile app reference works, place bracketed after the container-title -->
+          <text macro="format"/>
+        </else-if>
+        <else-if type="report">
+          <!-- For chapters in reports, place bracketed after the container title -->
+          <text macro="format"/>
+        </else-if>
       </choose>
     </group>
   </macro>
-  <macro name="format-short">
+  <macro name="secondary-contributors">
     <choose>
-      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <text macro="secondary-contributors-periodical"/>
+      </if>
+      <else-if type="paper-conference">
         <choose>
-          <if variable="reviewed-title" match="none">
-            <choose>
-              <if variable="genre">
-                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
-                <group delimiter=", ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text variable="title" form="short" font-style="italic"/>
-                </group>
-              </if>
-              <else>
-                <!-- This should be localized -->
-                <group delimiter=" ">
-                  <text value="Review of"/>
-                  <text variable="title" form="short" font-style="italic"/>
-                </group>
-              </else>
-            </choose>
+          <if variable="collection-editor editor editorial-director" match="any">
+            <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
-            <text variable="title" form="short" quotes="true"/>
+            <text macro="secondary-contributors-periodical"/>
           </else>
         </choose>
-      </if>
-      <else-if type="speech thesis" match="any">
-        <text variable="medium" text-case="capitalize-first"/>
-      </else-if>
-      <!-- book is here to catch software with container titles -->
-      <else-if type="book report" match="any">
-        <choose>
-          <if variable="container-title" match="none">
-            <text macro="format-report"/>
-          </if>
-        </choose>
-      </else-if>
-      <else-if type="manuscript pamphlet" match="any">
-        <text variable="medium" text-case="capitalize-first"/>
       </else-if>
-      <else-if type="personal_communication">
-        <text macro="secondary-contributors"/>
-      </else-if>
-      <else-if type="song">
-        <group delimiter="; ">
-          <text macro="secondary-contributors"/>
+      <else>
+        <text macro="secondary-contributors-booklike"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-periodical">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer" delimiter="; ">
+            <name and="text" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <names variable="translator" delimiter="; ">
+        <name and="text" initialize-with=". " delimiter=", "/>
+        <label form="short" prefix=", " text-case="title"/>
+      </names>
+    </group>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
+            <name and="text" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <!-- When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
+      <choose>
+        <if type="post webpage" match="none">
+          <!-- Webpages treat container-title like publisher -->
           <choose>
             <if variable="container-title" match="none">
-              <group delimiter=", ">
-                <text variable="genre" text-case="capitalize-first"/>
-                <text variable="medium" text-case="capitalize-first"/>
+              <group delimiter="; ">
+                <names variable="container-author">
+                  <label form="verb-short" suffix=" " text-case="title"/>
+                  <name and="text" initialize-with=". " delimiter=", "/>
+                </names>
+                <names variable="editor translator" delimiter="; ">
+                  <name and="text" initialize-with=". " delimiter=", "/>
+                  <label form="short" prefix=", " text-case="title"/>
+                </names>
               </group>
             </if>
           </choose>
-        </group>
-      </else-if>
-      <else-if type="paper-conference">
-        <group delimiter=", ">
-          <choose>
-            <if variable="collection-editor editor issue page volume" match="any">
-              <text variable="genre" text-case="capitalize-first"/>
-            </if>
-          </choose>
-          <text variable="medium" text-case="capitalize-first"/>
-        </group>
-      </else-if>
-      <else-if type="bill legislation legal_case patent treaty" match="none">
-        <choose>
-          <if variable="genre medium" match="any">
-            <group delimiter=", ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <text variable="medium" text-case="capitalize-first"/>
-            </group>
-          </if>
-          <else-if type="dataset">
-            <!-- This should be localized -->
-            <text value="Data set"/>
-          </else-if>
-        </choose>
-      </else-if>
-    </choose>
+        </if>
+        <else>
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="text" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="text" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </else>
+      </choose>
+    </group>
   </macro>
-  <macro name="description-report">
+  <macro name="database-location">
     <choose>
-      <if variable="number">
-        <group delimiter="; ">
-          <group delimiter=" ">
-            <text variable="genre" text-case="title"/>
-            <!-- Replace with term="number" if that becomes available -->
-            <text term="issue" form="short" text-case="capitalize-first"/>
-            <text variable="number"/>
-          </group>
-          <text macro="locators"/>
-        </group>
+      <if variable="archive-place" match="none">
+        <!-- With `archive-place`: physical archives. Without: online archives. -->
+        <!-- Add archive_collection as that becomes available -->
+        <text variable="archive_location"/>
       </if>
-      <else>
-        <text macro="locators"/>
-      </else>
     </choose>
   </macro>
-  <macro name="format-report">
+  <macro name="number">
     <choose>
       <if variable="number">
-        <text variable="medium" text-case="capitalize-first"/>
-      </if>
-      <else>
         <group delimiter=", ">
-          <text variable="genre" text-case="capitalize-first"/>
-          <text variable="medium" text-case="capitalize-first"/>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="archive">
-    <group delimiter=". ">
-      <group delimiter=", ">
-        <choose>
-          <if type="manuscript">
-            <text variable="genre"/>
-          </if>
-        </choose>
-        <group delimiter=" ">
-          <!-- Replace "archive" with "archive_collection" as that becomes available -->
-          <text variable="archive"/>
-          <text variable="archive_location" prefix="(" suffix=")"/>
-        </group>
-      </group>
-      <group delimiter=", ">
-        <!-- Move "archive" here when "archive_collection" becomes available -->
-        <text variable="archive-place"/>
-      </group>
-    </group>
-  </macro>
-  <macro name="publisher">
-    <choose>
-      <if type="manuscript pamphlet" match="any">
-        <choose>
-          <if variable="archive archive_location archive-place" match="any">
-            <group delimiter=". ">
-              <group delimiter=": ">
-                <text variable="publisher-place"/>
-                <text variable="publisher"/>
-              </group>
-              <text macro="archive"/>
-            </group>
-          </if>
-          <else>
-            <group delimiter=", ">
-              <text variable="genre"/>
-              <text variable="publisher"/>
-              <text variable="publisher-place"/>
-            </group>
-          </else>
-        </choose>
-      </if>
-      <else-if type="thesis" match="any">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="publisher"/>
-            <text variable="publisher-place"/>
-          </group>
-          <text macro="archive"/>
-        </group>
-      </else-if>
-      <else-if type="patent">
-        <group delimiter=". ">
-          <group delimiter=": ">
-            <text variable="publisher-place"/>
-            <text variable="publisher"/>
+          <group delimiter=" ">
+            <text variable="genre" text-case="title"/>
+            <choose>
+              <if is-numeric="number">
+                <!-- Replace with label variable="number" if that becomes available -->
+                <text term="issue" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </if>
+              <else>
+                <text variable="number"/>
+              </else>
+            </choose>
           </group>
-          <text macro="archive"/>
-        </group>
-      </else-if>
-      <else-if type="article-journal article-magazine article-newspaper" match="any">
-        <text macro="archive"/>
-      </else-if>
-      <else-if type="post post-weblog webpage" match="none">
-        <group delimiter=". ">
           <choose>
-            <if variable="event">
+            <if type="thesis">
               <choose>
-                <!-- Only print publisher info if published in a proceedings -->
-                <if variable="collection-editor editor issue page volume" match="any">
-                  <group delimiter=": ">
-                    <text variable="publisher-place"/>
-                    <text variable="publisher"/>
-                  </group>
+                <!-- Include the university in brackets if thesis is published -->
+                <if variable="archive DOI URL" match="any">
+                  <text variable="publisher"/>
                 </if>
               </choose>
             </if>
-            <else>
-              <group delimiter=": ">
-                <text variable="publisher-place"/>
-                <text variable="publisher"/>
-              </group>
-            </else>
           </choose>
-          <text macro="archive"/>
         </group>
-      </else-if>
+      </if>
     </choose>
   </macro>
-  <macro name="event">
+  <macro name="locators-booklike">
     <choose>
-      <if variable="event" type="speech paper-conference" match="any">
+      <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>
+      <else-if type="paper-conference">
         <choose>
-          <!-- Don't print event info if published in a proceedings -->
-          <if variable="collection-editor editor issue page volume" match="none">
-            <group delimiter=" ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <group delimiter=" ">
-                <choose>
-                  <if variable="genre">
-                    <text term="presented at"/>
-                  </if>
-                  <else>
-                    <text term="presented at" text-case="capitalize-first"/>
-                  </else>
-                </choose>
-                <group delimiter=", ">
-                  <text variable="event"/>
-                  <text variable="event-place"/>
-                </group>
-              </group>
+          <if variable="collection-editor editor editorial-director" match="any">
+            <group delimiter=", ">
+              <text macro="version"/>
+              <text macro="edition"/>
+              <text macro="volume-booklike"/>
             </group>
           </if>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="issued">
-    <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if variable="issued">
-        <group>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
-          <text variable="year-suffix"/>
-          <choose>
-            <if type="speech">
-              <date variable="issued" delimiter=" ">
-                <date-part prefix=", " name="month"/>
-              </date>
-            </if>
-            <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
-              <date variable="issued">
-                <date-part prefix=", " name="month"/>
-                <date-part prefix=" " name="day"/>
-              </date>
-            </else-if>
-            <else-if type="paper-conference">
-              <choose>
-                <if variable="container-title" match="none">
-                  <date variable="issued">
-                    <date-part prefix=", " name="month"/>
-                    <date-part prefix=" " name="day"/>
-                  </date>
-                </if>
-              </choose>
-            </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
-          </choose>
-        </group>
-      </else-if>
-      <else-if variable="status">
-        <group>
-          <text variable="status" text-case="lowercase"/>
-          <text variable="year-suffix" prefix="-"/>
-        </group>
+        </choose>
       </else-if>
       <else>
-        <group>
-          <text term="no date" form="short"/>
-          <text variable="year-suffix" prefix="-"/>
+        <group delimiter=", ">
+          <text macro="version"/>
+          <text macro="edition"/>
+          <text macro="volume-booklike"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="version">
+    <choose>
+      <if is-numeric="version">
+        <group delimiter=" ">
+          <!-- replace with label variable="version" if that becomes available -->
+          <text term="version" text-case="capitalize-first"/>
+          <text variable="version"/>
         </group>
+      </if>
+      <else>
+        <text variable="version"/>
       </else>
     </choose>
   </macro>
-  <macro name="issued-sort">
+  <macro name="edition">
     <choose>
-      <if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
-        <date variable="issued">
-          <date-part name="year"/>
-          <date-part name="month"/>
-          <date-part name="day"/>
-        </date>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <label variable="edition" form="short"/>
+        </group>
       </if>
       <else>
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
-  <macro name="issued-year">
-    <group>
+  <macro name="volume-booklike">
+    <group delimiter=", ">
+      <!-- Report series [ex. 52] -->
+      <choose>
+        <if type="report">
+          <group delimiter=" ">
+            <text variable="collection-title" text-case="title"/>
+            <text variable="collection-number"/>
+          </group>
+        </if>
+      </choose>
       <choose>
-        <if type="personal_communication">
+        <if variable="volume" match="any">
           <choose>
-            <if variable="archive DOI publisher URL" match="none">
-              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
-              <date variable="issued" form="text"/>
-            </if>
+            <!-- Non-numeric volumes are already printed as part of the book title -->
+            <if is-numeric="volume" match="none"/>
             <else>
-              <date variable="issued">
-                <date-part name="year"/>
-              </date>
+              <group delimiter=" ">
+                <label variable="volume" form="short" text-case="capitalize-first"/>
+                <number variable="volume" form="numeric"/>
+              </group>
             </else>
           </choose>
         </if>
         <else>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <group>
+            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <text term="page-range-delimiter" prefix="1"/>
+            <number variable="number-of-volumes" form="numeric"/>
+          </group>
         </else>
       </choose>
-      <text variable="year-suffix"/>
+      <group delimiter=" ">
+        <label variable="issue" text-case="capitalize-first"/>
+        <text variable="issue"/>
+      </group>
+      <group delimiter=" ">
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
     </group>
   </macro>
-  <macro name="issued-citation">
+  <macro name="reviewed-title">
     <choose>
-      <if variable="issued">
-        <group delimiter="/">
-          <choose>
-            <if is-uncertain-date="original-date">
-              <group prefix="[" suffix="]" delimiter=" ">
-                <text term="circa" form="short"/>
-                <date variable="original-date">
-                  <date-part name="year"/>
-                </date>
-              </group>
-            </if>
-            <else>
-              <date variable="original-date">
-                <date-part name="year"/>
-              </date>
-            </else>
-          </choose>
-          <choose>
-            <if is-uncertain-date="issued">
-              <group prefix="[" suffix="]" delimiter=" ">
-                <text term="circa" form="short"/>
-                <text macro="issued-year"/>
-              </group>
-            </if>
-            <else>
-              <text macro="issued-year"/>
-            </else>
-          </choose>
-        </group>
+      <if variable="reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed 
+              works [Ex. 69] -->
+        <text variable="reviewed-title" font-style="italic"/>
       </if>
-      <else-if variable="status">
-        <text variable="status" text-case="lowercase"/>
-        <text variable="year-suffix" prefix="-"/>
-      </else-if>
       <else>
-        <text term="no date" form="short"/>
-        <text variable="year-suffix" prefix="-"/>
+        <!-- Assume title is title of reviewed work -->
+        <text variable="title" font-style="italic"/>
       </else>
     </choose>
   </macro>
-  <macro name="original-date">
+  <macro name="reviewed-title-intext">
     <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech">
-        <date variable="original-date" delimiter=" ">
-          <date-part name="month"/>
-          <date-part name="year"/>
-        </date>
-      </else-if>
-      <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
-        <date variable="original-date" form="text"/>
-      </else-if>
+      <if variable="reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed works [Ex. 69] -->
+        <text variable="reviewed-title" form="short" font-style="italic"/>
+      </if>
       <else>
-        <date variable="original-date">
-          <date-part name="year"/>
-        </date>
+        <!-- Assume title is title of reviewed work -->
+        <text variable="title" form="short" font-style="italic"/>
       </else>
     </choose>
   </macro>
-  <macro name="original-published">
-    <!--This should be localized -->
+  <macro name="format">
     <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if type="interview motion_picture song" match="any">
-        <text value="Original work recorded"/>
+      <if variable="genre medium" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="number" match="none">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </if>
+      <!-- Generic labels for specific types -->
+      <!-- These should be localized when possible -->
+      <else-if type="dataset">
+        <text value="Data set"/>
       </else-if>
-      <else-if type="broadcast">
-        <text value="Original work broadcast"/>
+      <else-if type="book" variable="version" match="all">
+        <!-- Replace with type="software" and term="software" as that becomes available -->
+        <text value="Computer software"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="letter" text-case="capitalize-first"/>
+          </if>
+          <else-if type="interview">
+            <text term="interview" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="map">
+        <text value="Map"/>
       </else-if>
-      <else>
-        <text value="Original work published"/>
-      </else>
     </choose>
   </macro>
-  <macro name="edition">
+  <macro name="format-intext">
     <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short"/>
-        </group>
+      <if variable="genre" match="any">
+        <text variable="genre" text-case="capitalize-first"/>
       </if>
-      <else>
-        <text variable="edition"/>
-      </else>
+      <else-if variable="medium">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <!-- Generic labels for specific types -->
+      <!-- These should be localized when possible -->
+      <else-if type="dataset">
+        <text value="Data set"/>
+      </else-if>
+      <else-if type="book" variable="version" match="all">
+        <!-- Replace with type="software" and term="software" as that becomes available -->
+        <text value="Computer software"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="letter" text-case="capitalize-first"/>
+          </if>
+          <else-if type="interview">
+            <text term="interview" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="map">
+        <text value="Map"/>
+      </else-if>
     </choose>
   </macro>
-  <macro name="locators">
+  <!-- APA 'source' element contains four parts:
+        container, event, publisher, access -->
+  <macro name="container">
     <choose>
-      <if type="article-journal article-magazine figure review review-book" match="any">
-        <group delimiter=", ">
-          <group>
-            <text variable="volume" font-style="italic"/>
-            <text variable="issue" prefix="(" suffix=")"/>
-          </group>
-          <text variable="page"/>
-        </group>
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <!-- Periodical items -->
+        <text macro="container-periodical"/>
       </if>
-      <else-if type="article-newspaper">
-        <group delimiter=" ">
-          <label variable="page" form="short"/>
-          <text variable="page"/>
-        </group>
-      </else-if>
       <else-if type="paper-conference">
+        <!-- Determine if paper-conference is a periodical or booklike -->
         <choose>
-          <if variable="collection-editor editor" match="any">
-            <text macro="locators-booklike"/>
+          <if variable="editor editorial-director collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
           </if>
           <else>
-            <group delimiter=", ">
-              <group>
-                <text variable="volume" font-style="italic"/>
-                <text variable="issue" prefix="(" suffix=")"/>
-              </group>
-              <text variable="page"/>
-            </group>
+            <text macro="container-periodical"/>
           </else>
         </choose>
       </else-if>
-      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
-        <text macro="locators-booklike"/>
+      <else-if type="post webpage" match="none">
+        <!-- post and webpage treat container-title like publisher -->
+        <text macro="container-booklike"/>
       </else-if>
     </choose>
   </macro>
-  <macro name="locators-booklike">
-    <group delimiter=", ">
-      <text macro="edition"/>
-      <group delimiter=" ">
-        <text term="version" text-case="capitalize-first"/>
-        <text variable="version"/>
+  <macro name="container-periodical">
+    <group delimiter=". ">
+      <group delimiter=", ">
+        <text variable="container-title" font-style="italic" text-case="title"/>
+        <choose>
+          <if variable="volume">
+            <group>
+              <text variable="volume" font-style="italic"/>
+              <text variable="issue" prefix="(" suffix=")"/>
+            </group>
+          </if>
+          <else>
+            <text variable="issue" font-style="italic"/>
+          </else>
+        </choose>
+        <choose>
+          <if variable="page">
+            <text variable="page"/>
+          </if>
+          <else>
+            <!-- Ex. 6: Journal article with article number or eLocator -->
+            <!-- This should be localized -->
+            <text variable="number" prefix="Article "/>
+          </else>
+        </choose>
       </group>
       <choose>
-        <if variable="volume" match="any">
+        <if variable="issued">
           <choose>
-            <if is-numeric="volume" match="none"/>
-            <else-if variable="collection-title">
-              <choose>
-                <if variable="editor translator" match="none">
-                  <choose>
-                    <if variable="collection-number">
-                      <group>
-                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                        <number variable="volume" form="numeric"/>
-                      </group>
-                    </if>
-                  </choose>
-                </if>
-              </choose>
-            </else-if>
-            <else>
-              <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
-              </group>
-            </else>
+            <if variable="issue page volume" match="none">
+              <text variable="status" text-case="capitalize-first"/>
+            </if>
           </choose>
         </if>
-        <else>
-          <group>
-            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
-          </group>
-        </else>
-      </choose>
-      <group>
-        <label variable="page" form="short" suffix=" "/>
-        <text variable="page"/>
-      </group>
-    </group>
-  </macro>
-  <macro name="citation-locator">
-    <group>
-      <choose>
-        <if locator="chapter">
-          <label variable="locator" text-case="capitalize-first"/>
-        </if>
-        <else>
-          <label variable="locator" form="short"/>
-        </else>
       </choose>
-      <text variable="locator" prefix=" "/>
     </group>
   </macro>
-  <macro name="container">
+  <macro name="container-booklike">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
-        <group delimiter=", ">
-          <text macro="container-title"/>
-          <text macro="locators"/>
-        </group>
-        <choose>
-          <!--for advance online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
-      </if>
-      <else-if type="article dataset figure" match="any">
-        <choose>
-          <if variable="container-title">
-            <group delimiter=", ">
-              <text macro="container-title"/>
-              <text macro="locators"/>
-            </group>
-            <choose>
-              <!--for advance online publication-->
-              <if variable="issued">
-                <choose>
-                  <if variable="page issue" match="none">
-                    <text variable="status" text-case="capitalize-first" prefix=". "/>
-                  </if>
-                </choose>
-              </if>
-            </choose>
-          </if>
-        </choose>
-      </else-if>
-      <!-- book is here to catch software with container titles -->
-      <else-if type="book" variable="container-title" match="all">
+      <if variable="container-title" match="any">
         <group delimiter=" ">
-          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <text term="in" text-case="capitalize-first"/>
           <group delimiter=", ">
-            <text macro="container-contributors"/>
-            <group delimiter=" ">
-              <text macro="container-title"/>
-              <text macro="description-report" prefix="(" suffix=")"/>
-              <text macro="format-report" prefix="[" suffix="]"/>
+            <names variable="editor translator" delimiter=", &amp; ">
+              <!-- Change to editortranslator and move editor to substitute as that becomes available -->
+              <name and="text" initialize-with=". " delimiter=", "/>
+              <label form="short" text-case="title" prefix=" (" suffix=")"/>
+              <substitute>
+                <names variable="editorial-director"/>
+                <names variable="collection-editor"/>
+                <names variable="container-author"/>
+              </substitute>
+            </names>
+            <group delimiter=": " font-style="italic">
+              <text variable="container-title"/>
+              <!-- Replace with volume-title as that becomes available -->
+              <choose>
+                <if is-numeric="volume" match="none">
+                  <group delimiter=" ">
+                    <label variable="volume" form="short" text-case="capitalize-first"/>
+                    <text variable="volume"/>
+                  </group>
+                </if>
+              </choose>
             </group>
           </group>
+          <text macro="parenthetical-container"/>
+          <text macro="bracketed-container"/>
         </group>
-      </else-if>
-      <else-if type="report" variable="container-title" match="all">
-        <group delimiter=" ">
-          <text term="in" text-case="capitalize-first" suffix=" "/>
-          <group delimiter=", ">
-            <text macro="container-contributors"/>
-            <group delimiter=" ">
-              <text macro="container-title"/>
-              <text macro="description-report" prefix="(" suffix=")"/>
-              <text macro="format-report" prefix="[" suffix="]"/>
-            </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <choose>
+        <if type="thesis">
+          <choose>
+            <if variable="archive DOI URL" match="none">
+              <text variable="publisher"/>
+            </if>
+          </choose>
+        </if>
+        <else-if type="post webpage">
+          <!-- For websites, treat container title like publisher -->
+          <group delimiter="; ">
+            <text variable="container-title" text-case="title"/>
+            <text variable="publisher"/>
           </group>
-        </group>
-      </else-if>
-      <else-if type="song" variable="container-title" match="all">
+        </else-if>
+        <else-if type="paper-conference">
+          <!-- For paper-conference, don't print publisher if in a journal-like proceedings -->
+          <choose>
+            <if variable="collection-editor editor editorial-director" match="any">
+              <text variable="publisher"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article-journal article-magazine article-newspaper post-weblog" match="none">
+          <text variable="publisher"/>
+        </else-if>
+      </choose>
+      <group delimiter=", ">
+        <choose>
+          <if variable="archive-place">
+            <!-- With `archive-place`: physical archives. Without: online archives. -->
+            <!-- For physical archives, print the location before the archive name.
+                For electronic archives, these are printed in macro="description". -->
+            <!-- Split "archive_location" into "archive_collection" and "archive_location" as that becomes available -->
+            <!-- Must test for archive_collection:
+                With collection: archive_collection (archive_location), archive, archive-place
+                No collection: archive (archive_location), archive-place
+            -->
+            <text variable="archive_location"/>
+          </if>
+        </choose>
+        <text variable="archive"/>
+        <text variable="archive-place"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else-if variable="URL">
         <group delimiter=" ">
-          <text term="in" text-case="capitalize-first" suffix=" "/>
-          <group delimiter=", ">
-            <text macro="container-contributors"/>
-            <group delimiter=" ">
-              <text macro="container-title"/>
-              <text macro="locators" prefix="(" suffix=")"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="genre" text-case="capitalize-first"/>
-                <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="issued status" match="none">
+              <group delimiter=" ">
+                <text term="retrieved" text-case="capitalize-first"/>
+                <date variable="accessed" form="text" suffix=","/>
+                <text term="from"/>
               </group>
-            </group>
-          </group>
+            </if>
+          </choose>
+          <text variable="URL"/>
         </group>
       </else-if>
-      <else-if type="paper-conference">
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
-          <if variable="editor collection-editor container-author" match="any">
-            <text macro="container-booklike"/>
-          </if>
-          <else>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <!-- Don't print event info if published in a proceedings -->
             <group delimiter=", ">
-              <text macro="container-title"/>
-              <text macro="locators"/>
+              <text variable="event"/>
+              <text variable="event-place"/>
             </group>
-          </else>
-        </choose>
-      </else-if>
-      <else-if type="book">
-        <choose>
-          <!-- book and software should not cite collection-title, only container-title -->
-          <if variable="container-title">
-            <text macro="container-booklike"/>
           </if>
         </choose>
-      </else-if>
-      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
-        <text macro="container-booklike"/>
-      </else-if>
-      <else-if type="bill legal_case legislation treaty" match="any">
-        <text macro="legal-cites"/>
-      </else-if>
+      </if>
     </choose>
   </macro>
-  <macro name="container-booklike">
+  <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
+  <macro name="publication-history">
     <choose>
-      <if variable="container-title collection-title" match="any">
-        <group delimiter=" ">
-          <text term="in" text-case="capitalize-first"/>
+      <if type="patent" match="none">
+        <group prefix="(" suffix=")">
+          <choose>
+            <if variable="references">
+              <!-- This provides the option for more elaborate description 
+                    of publication history, such as full "reprinted" references
+                    (examples 11, 43, 44) or retracted references -->
+              <text variable="references"/>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text value="Original work published"/>
+                <choose>
+                  <if is-uncertain-date="original-date">
+                    <text term="circa" form="short"/>
+                  </if>
+                </choose>
+                <date variable="original-date">
+                  <date-part name="year"/>
+                </date>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else>
+        <text variable="references" prefix="(" suffix=")"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- Legal citations have their own rules -->
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+            </group>
+            <text variable="references"/>
+          </group>
+          <text macro="access"/>
+        </group>
+      </if>
+      <else-if type="bill">
+        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+        <group delimiter=". ">
           <group delimiter=", ">
-            <text macro="container-contributors"/>
             <choose>
-              <if variable="container-author editor translator" match="none">
-                <group delimiter=". ">
-                  <group delimiter=": ">
-                    <text variable="collection-title" font-style="italic" text-case="title"/>
-                    <choose>
-                      <if variable="collection-title">
-                        <group delimiter=" ">
-                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                          <number variable="collection-number" font-style="italic" form="numeric"/>
-                          <choose>
-                            <if variable="collection-number" match="none">
-                              <number variable="volume" font-style="italic" form="numeric"/>
-                            </if>
-                          </choose>
-                        </group>
-                      </if>
-                    </choose>
-                  </group>
-                  <!-- Replace with volume-title as that becomes available -->
-                  <group delimiter=": ">
-                    <text macro="container-title"/>
-                    <choose>
-                      <if variable="collection-title" is-numeric="volume" match="none">
-                        <group delimiter=" ">
-                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                          <text variable="volume" font-style="italic"/>
-                        </group>
-                      </if>
-                    </choose>
-                  </group>
-                </group>
+              <if variable="number container-title" match="none">
+                <!-- If no number or container-title, then assume it is a hearing -->
+                <text variable="title" font-style="italic"/>
               </if>
               <else>
-                <!-- Replace with volume-title as that becomes available -->
-                <group delimiter=": ">
-                  <text macro="container-title"/>
-                  <choose>
-                    <if is-numeric="volume" match="none">
-                      <group delimiter=" ">
-                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                        <text variable="volume" font-style="italic"/>
-                      </group>
-                    </if>
-                  </choose>
-                </group>
+                <text variable="title"/>
               </else>
             </choose>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <choose>
+                <if variable="number container-title" match="none">
+                  <!-- If no number or container-title, then assume it is a hearing -->
+                  <names variable="author" prefix="(testimony of " suffix=")">
+                    <name and="text" delimiter=", "/>
+                  </names>
+                </if>
+                <else>
+                  <text variable="status" prefix="(" suffix=")"/>
+                </else>
+              </choose>
+            </group>
+            <text variable="references"/>
           </group>
-          <group delimiter="; " prefix="(" suffix=")">
-            <text macro="locators"/>
-            <names variable="container-author">
-              <label form="verb-short" suffix=" " text-case="title"/>
-              <name and="text" initialize-with=". " delimiter=", "/>
-            </names>
+          <text macro="access"/>
+        </group>
+      </else-if>
+      <else-if type="legislation">
+        <!-- Currently designed to handle statutes, codified regulations, executive orders.
+              For uncodified regulations, assume future code section is in status. -->
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <text variable="status" prefix="(" suffix=")"/>
+            </group>
+            <text variable="references"/>
           </group>
+          <text macro="access"/>
         </group>
-      </if>
+      </else-if>
+      <else-if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+              explanation for treaty items. The Bluebook format that was used in APA 6th
+              ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
+          <text macro="access"/>
+        </group>
+      </else-if>
     </choose>
   </macro>
-  <macro name="container-title">
+  <macro name="date-legal">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper dataset" match="any">
-        <text variable="container-title" font-style="italic" text-case="title"/>
+      <if type="legal_case">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <text variable="authority"/>
+          <choose>
+            <if variable="container-title" match="any">
+              <!-- Print only year for cases published in reporters-->
+              <date variable="issued" form="numeric" date-parts="year"/>
+            </if>
+            <else>
+              <date variable="issued" form="text"/>
+            </else>
+          </choose>
+        </group>
       </if>
-      <else-if type="paper-conference speech">
-        <choose>
-          <if variable="collection-editor container-author editor" match="any">
-            <text variable="container-title" font-style="italic"/>
-          </if>
-          <else>
-            <text variable="container-title" font-style="italic" text-case="title"/>
-          </else>
-        </choose>
+      <else-if type="bill legislation" match="any">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <group delimiter=" ">
+            <date variable="original-date">
+              <date-part name="year"/>
+            </date>
+            <text term="and" form="symbol"/>
+          </group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
       </else-if>
-      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
-        <text variable="container-title" font-style="italic"/>
+      <else-if type="treaty">
+        <date variable="issued" form="text"/>
       </else-if>
     </choose>
   </macro>
-  <macro name="legal-cites">
+  <macro name="container-legal">
+    <!-- Expect legal item container-titles to be stored in short form -->
     <choose>
       <if type="legal_case">
-        <group prefix=", " delimiter=" ">
-          <group delimiter=" ">
-            <choose>
-              <if variable="container-title">
+        <group delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <group delimiter=" ">
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!--change to label variable="section" as that becomes available -->
+                  <!-- Change to label variable="section" as that becomes available -->
                   <text term="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
-                <text variable="page"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <choose>
-                    <if is-numeric="number">
-                      <!-- Replace with term="number" if that becomes available -->
-                      <text term="issue" form="short" text-case="capitalize-first"/>
-                    </if>
-                  </choose>
-                  <text variable="number"/>
-                </group>
-              </else>
-            </choose>
-          </group>
-          <group prefix="(" suffix=")" delimiter=" ">
-            <text variable="authority"/>
-            <choose>
-              <if variable="container-title" match="any">
-                <!--Only print year for cases published in reporters-->
-                <date variable="issued" form="numeric" date-parts="year"/>
-              </if>
-              <else>
-                <date variable="issued" form="text"/>
-              </else>
-            </choose>
-          </group>
+                <choose>
+                  <if variable="page page-first" match="any">
+                    <text variable="page-first"/>
+                  </if>
+                  <else>
+                    <text value="___"/>
+                  </else>
+                </choose>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <choose>
+                  <if is-numeric="number">
+                    <!-- Replace with label variable="number" if that becomes available -->
+                    <text term="issue" form="short" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
-        <group prefix=", " delimiter=" ">
-          <group delimiter=", ">
-            <choose>
-              <if variable="number">
-                <!--There's a public law number-->
-                <text variable="number" prefix="Pub. L. No. "/>
-                <group delimiter=" ">
-                  <!--change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
-                  <text variable="section"/>
-                </group>
-                <group delimiter=" ">
-                  <text variable="volume"/>
-                  <text variable="container-title"/>
-                  <text variable="page-first"/>
-                </group>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="volume"/>
-                  <text variable="container-title"/>
-                  <!--change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
-                  <text variable="section"/>
-                </group>
-              </else>
-            </choose>
+      <else-if type="bill">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <group delimiter=" ">
+              <choose>
+                <if variable="chapter-number container-title" match="none">
+                  <!-- Replace with label variable="number" as that becomes available -->
+                  <text term="issue" form="short"/>
+                </if>
+              </choose>
+              <text variable="number"/>
+            </group>
+          </group>
+          <text variable="authority"/>
+          <text variable="chapter-number"/>
+          <group delimiter=" ">
+            <text variable="volume"/>
+            <text variable="container-title"/>
+            <text variable="page-first"/>
           </group>
-          <date variable="issued" prefix="(" suffix=")">
-            <date-part name="year"/>
-          </date>
         </group>
       </else-if>
+      <else-if type="legislation">
+        <choose>
+          <if variable="number">
+            <!--There's a public law number-->
+            <group delimiter=", ">
+              <text variable="number" prefix="Pub. L. No. "/>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <text variable="page-first"/>
+              </group>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="volume"/>
+              <text variable="container-title"/>
+              <choose>
+                <if variable="section">
+                  <group delimiter=" ">
+                    <!-- Change to label variable="section" as that becomes available -->
+                    <text term="section" form="symbol"/>
+                    <text variable="section"/>
+                  </group>
+                </if>
+                <else>
+                  <text variable="page-first"/>
+                </else>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else-if>
       <else-if type="treaty">
         <group delimiter=" ">
           <number variable="volume"/>
           <text variable="container-title"/>
-          <text variable="page"/>
+          <choose>
+            <if variable="page page-first" match="any">
+              <text variable="page-first"/>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <!-- Replace with label variable="number" if that becomes available -->
+                <text term="issue" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
         </group>
       </else-if>
     </choose>
   </macro>
-  <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
+  <macro name="citation-locator">
+    <group delimiter=" ">
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
     <sort>
-      <key macro="author" names-min="8" names-use-first="6"/>
-      <key macro="issued-sort"/>
+      <key macro="author-bib" names-min="21" names-use-first="19"/>
+      <key macro="date-sort-group"/>
+      <key macro="date-sort-date" sort="ascending"/>
+      <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
-        <text macro="author-short"/>
-        <text macro="issued-citation"/>
+        <text macro="author-intext"/>
+        <text macro="date-intext"/>
         <text macro="citation-locator"/>
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2">
+  <bibliography hanging-indent="true" et-al-min="21" et-al-use-first="19" et-al-use-last="true" entry-spacing="0" line-spacing="2">
     <sort>
-      <key macro="author"/>
-      <key macro="issued-sort" sort="ascending"/>
+      <key macro="author-bib"/>
+      <key macro="date-sort-group"/>
+      <key macro="date-sort-date" sort="ascending"/>
+      <key variable="status"/>
       <key macro="title"/>
     </sort>
     <layout>
-      <group suffix=".">
-        <group delimiter=". ">
-          <text macro="author"/>
+      <choose>
+        <if type="bill legal_case legislation treaty" match="any">
+          <!-- Legal items have different orders and delimiters -->
           <choose>
-            <if is-uncertain-date="issued">
-              <group prefix=" [" suffix="]" delimiter=" ">
-                <text term="circa" form="short"/>
-                <text macro="issued"/>
-              </group>
+            <if variable="DOI URL" match="any">
+              <text macro="legal-cites"/>
             </if>
             <else>
-              <text macro="issued" prefix=" (" suffix=")"/>
+              <text macro="legal-cites" suffix="."/>
             </else>
           </choose>
-          <group delimiter=" ">
-            <text macro="title"/>
-            <choose>
-              <if variable="title interviewer" type="interview" match="any">
-                <group delimiter=" ">
-                  <text macro="description"/>
-                  <text macro="format"/>
-                </group>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text macro="format"/>
-                  <text macro="description"/>
-                </group>
-              </else>
-            </choose>
-          </group>
-          <text macro="container"/>
-        </group>
-        <text macro="event" prefix=". "/>
-      </group>
-      <text macro="access" prefix=" "/>
-      <choose>
-        <if is-uncertain-date="original-date">
-          <group prefix=" [" suffix="]" delimiter=" ">
-            <text macro="original-published"/>
-            <text term="circa" form="short"/>
-            <text macro="original-date"/>
-          </group>
         </if>
-        <else-if variable="original-date">
-          <group prefix=" (" suffix=")" delimiter=" ">
-            <text macro="original-published"/>
-            <text macro="original-date"/>
+        <else>
+          <group delimiter=" ">
+            <group delimiter=". " suffix=".">
+              <text macro="author-bib"/>
+              <text macro="date-bib"/>
+              <text macro="title-and-descriptions"/>
+              <text macro="container"/>
+              <text macro="event"/>
+              <text macro="publisher"/>
+            </group>
+            <text macro="access"/>
+            <text macro="publication-history"/>
           </group>
-        </else-if>
+        </else>
       </choose>
     </layout>
   </bibliography>
-</style>
+</style>
\ No newline at end of file
diff --git a/apa-no-doi-no-issue.csl b/apa-no-doi-no-issue.csl
index 241f6b6e358c..792f07744245 100644
--- a/apa-no-doi-no-issue.csl
+++ b/apa-no-doi-no-issue.csl
@@ -2,10 +2,10 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
   <info>
     <title>American Psychological Association 6th edition (no DOIs, no issue numbers)</title>
-    <title-short>APA</title-short>
+    <title-short>APA (6th ed., no DOI)</title-short>
     <id>http://www.zotero.org/styles/apa-no-doi-no-issue</id>
     <link href="http://www.zotero.org/styles/apa-no-doi-no-issue" rel="self"/>
-    <link href="http://www.zotero.org/styles/apa" rel="template"/>
+    <link href="http://www.zotero.org/styles/apa-6th-edition" rel="template"/>
     <link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
     <author>
       <name>Simon Kornblith</name>
diff --git a/apa-old-doi-prefix.csl b/apa-old-doi-prefix.csl
index f08c2ad6f264..8add3d6d7638 100644
--- a/apa-old-doi-prefix.csl
+++ b/apa-old-doi-prefix.csl
@@ -2,10 +2,10 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
   <info>
     <title>American Psychological Association 6th edition ("doi:" DOI prefix)</title>
-    <title-short>APA</title-short>
+    <title-short>APA (6th ed., "doi:" DOI prefix)</title-short>
     <id>http://www.zotero.org/styles/apa-old-doi-prefix</id>
     <link href="http://www.zotero.org/styles/apa-old-doi-prefix" rel="self"/>
-    <link href="http://www.zotero.org/styles/apa" rel="template"/>
+    <link href="http://www.zotero.org/styles/apa-6th-edition" rel="template"/>
     <link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
     <author>
       <name>Simon Kornblith</name>
diff --git a/apa-single-spaced.csl b/apa-single-spaced.csl
index d0cb8b7bd96d..40fcb703ce45 100644
--- a/apa-single-spaced.csl
+++ b/apa-single-spaced.csl
@@ -1,38 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
   <info>
-    <title>American Psychological Association 6th edition (single-spaced bibliography)</title>
-    <title-short>APA</title-short>
+    <title>American Psychological Association 7th edition (single-spaced bibliography)</title>
+    <title-short>APA (single-spaced)</title-short>
     <id>http://www.zotero.org/styles/apa-single-spaced</id>
     <link href="http://www.zotero.org/styles/apa-single-spaced" rel="self"/>
     <link href="http://www.zotero.org/styles/apa" rel="template"/>
-    <link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
+    <link href="https://apastyle.apa.org/style-grammar-guidelines/references/examples" rel="documentation"/>
     <author>
-      <name>Simon Kornblith</name>
-      <email>simon@simonster.com</email>
-    </author>
-    <author>
-      <name> Brenton M. Wiernik</name>
+      <name>Brenton M. Wiernik</name>
       <email>zotero@wiernik.org</email>
     </author>
-    <contributor>
-      <name>Bruce D'Arcus</name>
-    </contributor>
-    <contributor>
-      <name>Curtis M. Humphrey</name>
-    </contributor>
-    <contributor>
-      <name>Richard Karnesky</name>
-      <email>karnesky+zotero@gmail.com</email>
-      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
-    </contributor>
-    <contributor>
-      <name>Sebastian Karcher</name>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <updated>2016-09-28T13:09:49+00:00</updated>
+    <updated>2019-12-04T13:09:49+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -42,14 +24,28 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
-      <term name="interviewer" form="short">interviewer</term>
+      <term name="interviewer" form="short">
+        <single>interviewer</single>
+        <multiple>interviewers</multiple>
+      </term>
+      <term name="collection-editor" form="short">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
       <term name="circa" form="short">ca.</term>
-      <term name="collection-editor" form="short">series ed.</term>
+      <term name="bc"> B.C.E.</term>
+      <term name="ad"> C.E.</term>
+      <term name="letter">personal communication</term>
+      <term name="letter" form="short">letter</term>
+      <term name="issue" form="long">
+        <single>issue</single>
+        <multiple>issues</multiple>
+      </term>
     </terms>
   </locale>
-  <locale xml:lang="es">
+  <locale xml:lang="da">
     <terms>
-      <term name="from">de</term>
+      <term name="et-al">et al.</term>
     </terms>
   </locale>
   <locale xml:lang="de">
@@ -57,1471 +53,1615 @@
       <term name="et-al">et al.</term>
     </terms>
   </locale>
-  <locale xml:lang="da">
+  <locale xml:lang="es">
     <terms>
-      <term name="et-al">et al.</term>
+      <term name="from">de</term>
     </terms>
   </locale>
-  <locale xml:lang="nn">
+  <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
     </terms>
   </locale>
-  <locale xml:lang="nb">
+  <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
     </terms>
   </locale>
-  <macro name="container-contributors-booklike">
-    <choose>
-      <if variable="container-title">
-        <names variable="editor translator" delimiter=", &amp; ">
-          <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          <substitute>
-            <names variable="editorial-director"/>
-            <names variable="collection-editor"/>
-            <names variable="container-author"/>
-          </substitute>
-        </names>
-      </if>
-    </choose>
-  </macro>
-  <macro name="container-contributors">
-    <choose>
-      <!-- book is here to catch software with container titles -->
-      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
-        <text macro="container-contributors-booklike"/>
-      </if>
-      <else-if type="paper-conference">
-        <choose>
-          <if variable="collection-editor container-author editor" match="any">
-            <text macro="container-contributors-booklike"/>
-          </if>
-        </choose>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="secondary-contributors-booklike">
-    <group delimiter="; ">
-      <choose>
-        <if variable="title">
-          <names variable="interviewer">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-        </if>
-      </choose>
-      <choose>
-        <if variable="container-title" match="none">
-          <group delimiter="; ">
-            <names variable="container-author">
-              <label form="verb-short" suffix=" " text-case="title"/>
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-            </names>
-            <names variable="editor translator" delimiter="; ">
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-              <label form="short" prefix=", " text-case="title"/>
-            </names>
-          </group>
-        </if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="secondary-contributors">
-    <choose>
-      <!-- book is here to catch software with container titles -->
-      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
-        <text macro="secondary-contributors-booklike"/>
-      </if>
-      <else-if type="personal_communication">
-        <group delimiter="; ">
-          <group delimiter=" ">
-            <choose>
-              <if variable="genre" match="any">
-                <text variable="genre" text-case="capitalize-first"/>
-              </if>
-              <else>
-                <text term="letter" text-case="capitalize-first"/>
-              </else>
-            </choose>
-            <names variable="recipient" delimiter=", ">
-              <label form="verb" suffix=" "/>
-              <name and="symbol" delimiter=", "/>
-            </names>
-          </group>
-          <text variable="medium" text-case="capitalize-first"/>
-          <choose>
-            <if variable="container-title" match="none">
-              <names variable="editor translator" delimiter="; ">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </if>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="song">
-        <choose>
-          <if variable="original-author composer" match="any">
-            <group delimiter="; ">
-              <!-- Replace prefix with performer label as that becomes available -->
-              <names variable="author" prefix="Recorded by ">
-                <label form="verb" text-case="title"/>
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-              </names>
-              <names variable="translator">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </group>
-          </if>
-        </choose>
-      </else-if>
-      <else-if type="article-journal article-magazine article-newspaper" match="any">
-        <group delimiter="; ">
-          <choose>
-            <if variable="title">
-              <names variable="interviewer" delimiter="; ">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </if>
-          </choose>
-          <names variable="translator" delimiter="; ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-        </group>
-      </else-if>
-      <else-if type="paper-conference">
-        <choose>
-          <if variable="collection-editor editor" match="any">
-            <text macro="secondary-contributors-booklike"/>
-          </if>
-          <else>
-            <group delimiter="; ">
-              <choose>
-                <if variable="title">
-                  <names variable="interviewer" delimiter="; ">
-                    <name and="symbol" initialize-with=". " delimiter=", "/>
-                    <label form="short" prefix=", " text-case="title"/>
-                  </names>
-                </if>
-              </choose>
-              <names variable="translator" delimiter="; ">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </group>
-          </else>
-        </choose>
-      </else-if>
-      <else>
-        <group delimiter="; ">
-          <choose>
-            <if variable="title">
-              <names variable="interviewer">
-                <name and="symbol" initialize-with=". " delimiter="; "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </if>
-          </choose>
-          <names variable="editor translator" delimiter="; ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="author">
-    <choose>
-      <if type="song">
-        <names variable="composer" delimiter=", ">
+  <!-- General categories of item types:
+        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
+        Periodical or Booklike: paper-conference
+        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
+                  graphic interview manuscript map motion_picture musical_score pamphlet patent 
+                  personal_communication report song speech thesis post webpage
+        Legal: bill legal_case legislation treaty
+  -->
+  <!-- APA references contain four parts: author, date, title, source -->
+  <macro name="author-bib">
+    <names variable="composer" delimiter=", ">
+      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <substitute>
+        <names variable="author"/>
+        <names variable="illustrator"/>
+        <names variable="director">
           <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-          <substitute>
-            <names variable="original-author"/>
-            <names variable="author"/>
-            <names variable="translator">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <group delimiter=" ">
-              <text macro="title"/>
-              <text macro="description"/>
-              <text macro="format"/>
-            </group>
-          </substitute>
+          <label form="long" prefix=" (" suffix=")" text-case="title"/>
         </names>
-      </if>
-      <else-if type="treaty"/>
-      <else>
-        <names variable="author" delimiter=", ">
-          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-          <substitute>
-            <names variable="illustrator"/>
-            <names variable="composer"/>
-            <names variable="director">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="long" prefix=" (" suffix=")" text-case="title"/>
-            </names>
+        <choose>
+          <if variable="container-title">
             <choose>
-              <if variable="container-title">
+              <if type="book entry entry-dictionary entry-encyclopedia" match="any">
                 <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia">
-                    <text macro="title"/>
+                  <if variable="title">
+                    <group delimiter=" ">
+                      <text macro="title"/>
+                      <text macro="parenthetical"/>
+                    </group>
                   </if>
                   <else>
-                    <names variable="translator"/>
+                    <text macro="title-and-descriptions"/>
                   </else>
                 </choose>
-                <names variable="translator">
-                  <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-                  <label form="short" prefix=" (" suffix=")" text-case="title"/>
-                </names>
-              </if>
-            </choose>
-            <names variable="editor translator" delimiter=", ">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <names variable="editorial-director">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <names variable="collection-editor">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <choose>
-              <if type="report">
-                <text variable="publisher"/>
               </if>
             </choose>
+          </if>
+        </choose>
+        <!-- Test for editortranslator and put that first as that becomes available -->
+        <names variable="editor" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="editorial-director">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="collection-editor">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <choose>
+          <if variable="title">
             <group delimiter=" ">
               <text macro="title"/>
-              <text macro="description"/>
-              <text macro="format"/>
+              <text macro="parenthetical"/>
             </group>
-          </substitute>
-        </names>
-      </else>
-    </choose>
+          </if>
+          <else>
+            <text macro="title-and-descriptions"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
   </macro>
-  <macro name="author-short">
+  <macro name="author-intext">
     <choose>
-      <if type="patent" variable="number" match="all">
-        <text macro="patent-number"/>
+      <if type="bill legal_case legislation treaty" match="any">
+        <text macro="title-intext"/>
       </if>
-      <else-if type="treaty">
-        <text variable="title" form="short"/>
-      </else-if>
-      <else-if type="personal_communication">
+      <else-if type="interview personal_communication">
         <choose>
-          <if variable="archive DOI publisher URL" match="none">
+          <!-- These variables indicate that the letter is retrievable by the reader. 
+                If not, then use the APA in-text-only personal communication format -->
+          <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
               <names variable="author">
                 <name and="symbol" delimiter=", " initialize-with=". "/>
                 <substitute>
-                  <text variable="title" form="short" quotes="true"/>
+                  <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- This should be localized -->
-              <text value="personal communication"/>
+              <!-- Replace with term="personal-communication" if that becomes available -->
+              <text term="letter"/>
             </group>
           </if>
           <else>
             <names variable="author" delimiter=", ">
               <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
               <substitute>
-                <names variable="editor"/>
-                <names variable="translator"/>
-                <choose>
-                  <if variable="container-title">
-                    <text variable="title" form="short" quotes="true"/>
-                  </if>
-                  <else>
-                    <text variable="title" form="short" font-style="italic"/>
-                  </else>
-                </choose>
-                <text macro="format-short" prefix="[" suffix="]"/>
+                <text macro="title-intext"/>
               </substitute>
             </names>
           </else>
         </choose>
       </else-if>
-      <else-if type="song">
+      <else>
         <names variable="composer" delimiter=", ">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
           <substitute>
-            <names variable="original-author"/>
             <names variable="author"/>
-            <names variable="translator"/>
-            <choose>
-              <if variable="container-title">
-                <text variable="title" form="short" quotes="true"/>
-              </if>
-              <else>
-                <text variable="title" form="short" font-style="italic"/>
-              </else>
-            </choose>
-            <text macro="format-short" prefix="[" suffix="]"/>
-          </substitute>
-        </names>
-      </else-if>
-      <else>
-        <names variable="author" delimiter=", ">
-          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
-          <substitute>
             <names variable="illustrator"/>
-            <names variable="composer"/>
             <names variable="director"/>
             <choose>
               <if variable="container-title">
                 <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia">
-                    <text variable="title" form="short" quotes="true"/>
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
+                    <text macro="title-intext"/>
                   </if>
-                  <else>
-                    <names variable="translator"/>
-                  </else>
                 </choose>
               </if>
             </choose>
             <names variable="editor"/>
             <names variable="editorial-director"/>
-            <names variable="translator"/>
-            <choose>
-              <if type="report" variable="publisher" match="all">
-                <text variable="publisher"/>
-              </if>
-              <else-if type="legal_case">
-                <text variable="title" font-style="italic"/>
-              </else-if>
-              <else-if type="bill legislation" match="any">
-                <text variable="title" form="short"/>
-              </else-if>
-              <else-if variable="reviewed-author" type="review review-book" match="any">
-                <text macro="format-short" prefix="[" suffix="]"/>
-              </else-if>
-              <else-if type="post post-weblog webpage" variable="container-title" match="any">
-                <text variable="title" form="short" quotes="true"/>
-              </else-if>
-              <else>
-                <text variable="title" form="short" font-style="italic"/>
-              </else>
-            </choose>
-            <text macro="format-short" prefix="[" suffix="]"/>
+            <text macro="title-intext"/>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
-  <macro name="patent-number">
-    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
-    <group delimiter=" ">
-      <text variable="authority"/>
+  <macro name="date-bib">
+    <group delimiter=" " prefix="(" suffix=")">
       <choose>
-        <if variable="genre">
-          <text variable="genre" text-case="capitalize-first"/>
+        <if is-uncertain-date="issued">
+          <text term="circa" form="short"/>
         </if>
-        <else>
-          <!-- This should be localized -->
-          <text value="patent" text-case="capitalize-first"/>
-        </else>
       </choose>
-      <group delimiter=" ">
-        <text term="issue" form="short" text-case="capitalize-first"/>
-        <text variable="number"/>
-      </group>
-    </group>
-  </macro>
-  <macro name="access">
-    <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if variable="DOI" match="any">
-        <text variable="DOI" prefix="https://doi.org/"/>
-      </else-if>
-      <else-if variable="URL">
-        <group delimiter=" ">
-          <text term="retrieved" text-case="capitalize-first"/>
-          <choose>
-            <if type="post post-weblog webpage" match="any">
-              <date variable="accessed" form="text" suffix=","/>
-            </if>
-          </choose>
-          <text term="from"/>
-          <choose>
-            <if type="report">
-              <choose>
-                <if variable="author editor translator" match="any">
-                  <!-- This should be localized -->
-                  <text variable="publisher" suffix=" website:"/>
-                </if>
-              </choose>
-            </if>
-            <else-if type="post post-weblog webpage" match="any">
-              <!-- This should be localized -->
-              <text variable="container-title" suffix=" website:"/>
-            </else-if>
-          </choose>
-          <text variable="URL"/>
-        </group>
-      </else-if>
-      <else-if variable="archive">
+      <group>
         <choose>
-          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
-            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
+          <if variable="issued">
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+            <text variable="year-suffix"/>
             <choose>
-              <if variable="archive-place" match="none">
-                <group delimiter=" ">
-                  <text term="retrieved" text-case="capitalize-first"/>
-                  <text term="from"/>
-                  <text variable="archive" suffix="."/>
-                  <text variable="archive_location" prefix="(" suffix=")"/>
-                </group>
+              <if type="article-magazine article-newspaper broadcast interview motion_picture pamphlet personal_communication post post-weblog song speech webpage" match="any">
+                <!-- Many video and audio examples in manual give full dates. Err on the side of too much information. -->
+                <date variable="issued">
+                  <date-part prefix=", " name="month"/>
+                  <date-part prefix=" " name="day"/>
+                </date>
               </if>
-              <else>
-                <text macro="publisher" suffix="."/>
-              </else>
+              <else-if type="paper-conference">
+                <!-- Capture 'speech' stored as 'paper-conference' -->
+                <choose>
+                  <if variable="collection-editor editor editorial-director issue page volume" match="none">
+                    <date variable="issued">
+                      <date-part prefix=", " name="month"/>
+                      <date-part prefix=" " name="day"/>
+                    </date>
+                  </if>
+                </choose>
+              </else-if>
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
+          <else-if variable="status">
+            <group>
+              <text variable="status" text-case="lowercase"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
+          </else-if>
           <else>
-            <text macro="publisher" suffix="."/>
+            <group>
+              <text term="no date" form="short"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
           </else>
         </choose>
-      </else-if>
-      <else>
-        <text macro="publisher" suffix="."/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="title">
+      </group>
+    </group>
+  </macro>
+  <macro name="date-sort-group">
     <choose>
-      <if type="treaty">
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
+      <if variable="issued">
+        <text value="1"/>
+      </if>
+      <else-if variable="status">
+        <text value="2"/>
+      </else-if>
+      <else>
+        <text value="0"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-sort-date">
+    <choose>
+      <if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
+        <date variable="issued" form="numeric"/>
+      </if>
+      <else-if type="paper-conference">
+        <!-- Capture 'speech' stored as 'paper-conference' -->
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <date variable="issued" form="numeric"/>
+          </if>
+        </choose>
+      </else-if>
+      <else>
+        <date variable="issued" form="numeric"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-intext">
+    <choose>
+      <if variable="issued">
+        <group delimiter="/">
+          <group delimiter=" ">
+            <choose>
+              <if is-uncertain-date="original-date">
+                <text term="circa" form="short"/>
+              </if>
+            </choose>
+            <date variable="original-date">
+              <date-part name="year"/>
+            </date>
+          </group>
+          <group delimiter=" ">
+            <choose>
+              <if is-uncertain-date="issued">
+                <text term="circa" form="short"/>
+              </if>
+            </choose>
+            <group>
+              <choose>
+                <if type="interview personal_communication">
+                  <choose>
+                    <if variable="archive container-title DOI publisher URL" match="none">
+                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                            If not, then use the in-text-only personal communication format -->
+                      <date variable="issued" form="text"/>
+                    </if>
+                    <else>
+                      <date variable="issued">
+                        <date-part name="year"/>
+                      </date>
+                    </else>
+                  </choose>
+                </if>
+                <else>
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                </else>
+              </choose>
+              <text variable="year-suffix"/>
+            </group>
+          </group>
         </group>
       </if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
+      <else-if variable="status">
+        <text variable="status" text-case="lowercase"/>
+        <text variable="year-suffix" prefix="-"/>
       </else-if>
-      <else-if variable="title">
+      <else>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- APA has two description elements following the title:
+        title (parenthetical) [bracketed]  -->
+  <macro name="title-and-descriptions">
+    <choose>
+      <if variable="title">
+        <group delimiter=" ">
+          <text macro="title"/>
+          <text macro="parenthetical"/>
+          <text macro="bracketed"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <text macro="bracketed"/>
+          <text macro="parenthetical"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="post webpage" match="any">
+        <!-- Webpages are always italicized -->
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else-if variable="container-title" match="any">
+        <!-- Other types are italicized based on presence of container-title.
+              Assume that review and review-book are published in periodicals/blogs,
+              not just on a web page (ex. 69) -->
+        <text variable="title"/>
+      </else-if>
+      <else>
         <choose>
-          <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a software type -->
-            <text variable="title"/>
+          <if type="article-journal article-magazine article-newspaper post-weblog review review-book">
+            <text variable="title" font-style="italic"/>
           </if>
-          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <else-if type="paper-conference">
             <choose>
-              <if variable="reviewed-title">
-                <choose>
-                  <if type="post post-weblog webpage" variable="container-title" match="any">
-                    <text variable="title"/>
-                  </if>
-                  <else>
-                    <text variable="title" font-style="italic"/>
-                  </else>
-                </choose>
+              <if variable="collection-editor editor editorial-director" match="any">
+                <group delimiter=": " font-style="italic">
+                  <text variable="title"/>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <label variable="volume" form="short" text-case="capitalize-first"/>
+                        <text variable="volume"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
               </if>
+              <else>
+                <text variable="title" font-style="italic"/>
+              </else>
             </choose>
           </else-if>
-          <else-if type="post post-weblog webpage" variable="container-title" match="any">
-            <text variable="title"/>
+          <else>
+            <group delimiter=": " font-style="italic">
+              <text variable="title"/>
+              <!-- Replace with volume-title as that becomes available -->
+              <choose>
+                <if is-numeric="volume" match="none">
+                  <group delimiter=" ">
+                    <label variable="volume" form="short" text-case="capitalize-first"/>
+                    <text variable="volume"/>
+                  </group>
+                </if>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-intext">
+    <choose>
+      <if variable="title" match="none">
+        <text macro="bracketed-intext" prefix="[" suffix="]"/>
+      </if>
+      <else-if type="bill">
+        <!-- If a bill has no number or container-title, assume it is a hearing; italic and title case -->
+        <choose>
+          <if variable="number container-title" match="none">
+            <text variable="title" form="short" font-style="italic" text-case="title"/>
+          </if>
+          <else-if variable="title">
+            <text variable="title" form="short"/>
           </else-if>
           <else>
-            <text variable="title" font-style="italic"/>
+            <group delimiter=" ">
+              <text variable="genre"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="chapter-number container-title" match="none">
+                    <!-- Replace with label variable="number" as that becomes available -->
+                    <text term="issue" form="short"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </group>
           </else>
         </choose>
       </else-if>
-      <else-if variable="interviewer" type="interview" match="any">
-        <names variable="interviewer">
-          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
-          <name and="symbol" initialize-with=". " delimiter=", "/>
-        </names>
+      <else-if type="legal_case" match="any">
+        <!-- Cases are italicized -->
+        <text variable="title" font-style="italic"/>
       </else-if>
+      <else-if type="legislation treaty" match="any">
+        <!-- Legislation and treaties not italicized or quoted -->
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="post webpage" match="any">
+        <!-- Webpages are always italicized -->
+        <text variable="title" form="short" font-style="italic"/>
+      </else-if>
+      <else-if variable="container-title" match="any">
+        <!-- Other types are italicized or quoted based on presence of container-title. As in title macro. -->
+        <text variable="title" form="short" quotes="true"/>
+      </else-if>
+      <else>
+        <text variable="title" form="short" font-style="italic"/>
+      </else>
     </choose>
   </macro>
-  <!-- APA has four descriptive sections following the title: -->
-  <!-- (description), [format], container, event -->
-  <macro name="description">
+  <macro name="parenthetical">
+    <!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->
     <group prefix="(" suffix=")">
       <choose>
-        <!-- book is here to catch software with container titles -->
-        <if type="book report" match="any">
+        <if type="patent">
+          <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
+          <group delimiter=" ">
+            <text variable="authority" form="short"/>
+            <choose>
+              <if variable="genre">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <text value="patent" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <group delimiter=" ">
+              <!-- Replace with label variable="number" if that becomes available -->
+              <text term="issue" form="short" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </group>
+        </if>
+        <else-if type="post webpage">
+          <!-- For post webpage, container-title is treated as publisher -->
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <text macro="database-location"/>
+            <text macro="number"/>
+            <text macro="locators-booklike"/>
+          </group>
+        </else-if>
+        <else-if variable="container-title">
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <choose>
+              <if type="broadcast graphic map motion_picture song" match="any">
+                <!-- For audiovisual media, number information comes after title, not container-title -->
+                <text macro="number"/>
+              </if>
+            </choose>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <text macro="database-location"/>
+            <text macro="number"/>
+            <text macro="locators-booklike"/>
+          </group>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="parenthetical-container">
+    <choose>
+      <if variable="container-title" match="any">
+        <group prefix="(" suffix=")">
+          <group delimiter="; ">
+            <text macro="database-location"/>
+            <choose>
+              <if type="broadcast graphic map motion_picture song" match="none">
+                <!-- For audiovisual media, number information comes after title, not container-title -->
+                <text macro="number"/>
+              </if>
+            </choose>
+            <text macro="locators-booklike"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="bracketed">
+    <!-- [Descriptive information] -->
+    <!-- If there is a number, genre is already printed in macro="number" -->
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <!-- Reviewed item -->
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <!-- Assume that genre is entered as 'Review of the book' or similar -->
+                <choose>
+                  <if variable="number" match="none">
+                    <choose>
+                      <if variable="genre">
+                        <text variable="genre" text-case="capitalize-first"/>
+                      </if>
+                      <else-if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </else-if>
+                      <else>
+                        <!-- Replace with term="review" as that becomes available -->
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </if>
+                  <else>
+                    <choose>
+                      <if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                      <else>
+                        <!-- Replace with term="review" as that becomes available -->
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </else>
+                </choose>
+                <text macro="reviewed-title"/>
+              </group>
+              <names variable="reviewed-author">
+                <label form="verb-short" suffix=" "/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+            </group>
+            <choose>
+              <if variable="genre" match="any">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </group>
+        </if>
+        <else-if type="thesis">
+          <!-- Thesis type and institution -->
+          <group delimiter="; ">
+            <choose>
+              <if variable="number" match="none">
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="archive DOI URL" match="any">
+                      <!-- Include the university in brackets if thesis is published -->
+                      <text variable="publisher"/>
+                    </if>
+                  </choose>
+                </group>
+              </if>
+            </choose>
+            <text variable="medium" text-case="capitalize-first"/>
+          </group>
+        </else-if>
+        <else-if variable="interviewer" type="interview" match="any">
+          <!-- Interview information -->
           <choose>
-            <if variable="container-title">
-              <text macro="secondary-contributors"/>
+            <if variable="title">
+              <text macro="format"/>
             </if>
+            <else-if variable="genre">
+              <group delimiter="; ">
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <group delimiter=" ">
+                    <text term="author" form="verb"/>
+                    <names variable="interviewer">
+                      <name and="symbol" initialize-with=". " delimiter=", "/>
+                    </names>
+                  </group>
+                </group>
+              </group>
+            </else-if>
+            <else-if variable="interviewer">
+              <group delimiter="; ">
+                <names variable="interviewer">
+                  <label form="verb" suffix=" " text-case="capitalize-first"/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                </names>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </else-if>
             <else>
+              <text macro="format"/>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="personal_communication">
+          <!-- Letter information -->
+          <choose>
+            <if variable="recipient">
               <group delimiter="; ">
-                <text macro="description-report"/>
-                <text macro="secondary-contributors"/>
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="number" match="none">
+                      <choose>
+                        <if variable="genre">
+                          <text variable="genre" text-case="capitalize-first"/>
+                        </if>
+                        <else-if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </else-if>
+                        <else>
+                          <text term="letter" form="short" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </if>
+                    <else>
+                      <choose>
+                        <if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </if>
+                        <else>
+                          <text term="letter" form="short" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </else>
+                  </choose>
+                  <names variable="recipient" delimiter=", ">
+                    <label form="verb" suffix=" "/>
+                    <name and="symbol" delimiter=", "/>
+                  </names>
+                </group>
+                <choose>
+                  <if variable="genre" match="any">
+                    <choose>
+                      <if variable="number" match="none">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                    </choose>
+                  </if>
+                </choose>
               </group>
+            </if>
+            <else>
+              <text macro="format"/>
             </else>
           </choose>
-        </if>
-        <else-if type="thesis">
-          <group delimiter="; ">
-            <group delimiter=", ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <choose>
-                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
-                <if variable="DOI URL archive" match="any">
-                  <text variable="publisher"/>
-                </if>
-              </choose>
-            </group>
-            <text macro="locators"/>
-            <text macro="secondary-contributors"/>
-          </group>
         </else-if>
-        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+        <else-if variable="composer" type="song" match="all">
+          <!-- Performer of classical music works -->
           <group delimiter="; ">
-            <text macro="locators"/>
-            <text macro="secondary-contributors"/>
+            <choose>
+              <if variable="number" match="none">
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="genre">
+                      <text variable="genre" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </if>
+                    <else-if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else-if>
+                    <else>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </if>
+                    <else>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <choose>
+              <if variable="genre" match="any">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
           </group>
         </else-if>
-        <else-if type="song">
+        <else-if variable="container-title" match="none">
+          <!-- Other description -->
+          <text macro="format"/>
+        </else-if>
+        <else>
+          <!-- For conference presentations, chapters in reports, software, place bracketed after the container title -->
           <choose>
-            <if variable="container-title" match="none">
-              <text macro="locators"/>
+            <if type="paper-conference speech" match="any">
+              <choose>
+                <if variable="collection-editor editor editorial-director issue page volume" match="any">
+                  <text macro="format"/>
+                </if>
+              </choose>
             </if>
+            <else-if type="book">
+              <choose>
+                <if variable="version" match="none">
+                  <text macro="format"/>
+                </if>
+              </choose>
+            </else-if>
+            <else-if type="report" match="none">
+              <text macro="format"/>
+            </else-if>
           </choose>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="bracketed-intext">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <!-- This should be localized -->
+          <text macro="reviewed-title-intext" prefix="Review of "/>
+        </if>
+        <else-if variable="interviewer" type="interview" match="any">
+          <names variable="interviewer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <substitute>
+              <text macro="format-intext"/>
+            </substitute>
+          </names>
         </else-if>
-        <else-if type="article dataset figure" match="any">
+        <else-if type="personal_communication">
+          <!-- Letter information -->
           <choose>
-            <if variable="container-title">
-              <text macro="secondary-contributors"/>
+            <if variable="recipient">
+              <group delimiter=" ">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="genre" text-case="capitalize-first"/>
+                  </if>
+                  <else>
+                    <text term="letter" form="short" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <names variable="recipient" delimiter=", ">
+                  <label form="verb" suffix=" "/>
+                  <name and="symbol" delimiter=", "/>
+                </names>
+              </group>
             </if>
             <else>
-              <group delimiter="; ">
-                <text macro="locators"/>
-                <text macro="secondary-contributors"/>
-              </group>
+              <text macro="format-intext"/>
             </else>
           </choose>
         </else-if>
-        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
-          <text macro="secondary-contributors"/>
-        </else-if>
+        <else>
+          <text macro="format-intext"/>
+        </else>
       </choose>
     </group>
   </macro>
-  <macro name="format">
+  <macro name="bracketed-container">
     <group prefix="[" suffix="]">
       <choose>
-        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <group delimiter=", ">
-            <choose>
-              <if variable="genre">
-                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
-                <group delimiter=", ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <choose>
-                    <if variable="reviewed-title">
-                      <text variable="reviewed-title" font-style="italic"/>
-                    </if>
-                    <else>
-                      <!-- Assume `title` is title of reviewed work -->
-                      <text variable="title" font-style="italic"/>
-                    </else>
-                  </choose>
-                </group>
-              </if>
-              <else>
-                <!-- This should be localized -->
-                <group delimiter=" ">
-                  <text value="Review of"/>
-                  <choose>
-                    <if variable="reviewed-title">
-                      <text variable="reviewed-title" font-style="italic"/>
-                    </if>
-                    <else>
-                      <!-- Assume `title` is title of reviewed work -->
-                      <text variable="title" font-style="italic"/>
-                    </else>
-                  </choose>
-                </group>
-              </else>
-            </choose>
-            <names variable="reviewed-author">
-              <label form="verb-short" suffix=" "/>
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-            </names>
-          </group>
+        <if type="paper-conference speech" match="any">
+          <!-- Conference presentations should describe the session [container] in bracketed unless published in a proceedings -->
+          <choose>
+            <if variable="collection-editor editor editorial-director issue page volume" match="none">
+              <text macro="format"/>
+            </if>
+          </choose>
         </if>
-        <else>
-          <text macro="format-short"/>
-        </else>
+        <else-if type="book" variable="version" match="all">
+          <!-- For entries in mobile app reference works, place bracketed after the container-title -->
+          <text macro="format"/>
+        </else-if>
+        <else-if type="report">
+          <!-- For chapters in reports, place bracketed after the container title -->
+          <text macro="format"/>
+        </else-if>
       </choose>
     </group>
   </macro>
-  <macro name="format-short">
+  <macro name="secondary-contributors">
     <choose>
-      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <text macro="secondary-contributors-periodical"/>
+      </if>
+      <else-if type="paper-conference">
         <choose>
-          <if variable="reviewed-title" match="none">
-            <choose>
-              <if variable="genre">
-                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
-                <group delimiter=", ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text variable="title" form="short" font-style="italic"/>
-                </group>
-              </if>
-              <else>
-                <!-- This should be localized -->
-                <group delimiter=" ">
-                  <text value="Review of"/>
-                  <text variable="title" form="short" font-style="italic"/>
-                </group>
-              </else>
-            </choose>
+          <if variable="collection-editor editor editorial-director" match="any">
+            <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
-            <text variable="title" form="short" quotes="true"/>
+            <text macro="secondary-contributors-periodical"/>
           </else>
         </choose>
-      </if>
-      <else-if type="speech thesis" match="any">
-        <text variable="medium" text-case="capitalize-first"/>
-      </else-if>
-      <!-- book is here to catch software with container titles -->
-      <else-if type="book report" match="any">
-        <choose>
-          <if variable="container-title" match="none">
-            <text macro="format-report"/>
-          </if>
-        </choose>
-      </else-if>
-      <else-if type="manuscript pamphlet" match="any">
-        <text variable="medium" text-case="capitalize-first"/>
       </else-if>
-      <else-if type="personal_communication">
-        <text macro="secondary-contributors"/>
-      </else-if>
-      <else-if type="song">
-        <group delimiter="; ">
-          <text macro="secondary-contributors"/>
+      <else>
+        <text macro="secondary-contributors-booklike"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-periodical">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <names variable="translator" delimiter="; ">
+        <name and="symbol" initialize-with=". " delimiter=", "/>
+        <label form="short" prefix=", " text-case="title"/>
+      </names>
+    </group>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <!-- When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
+      <choose>
+        <if type="post webpage" match="none">
+          <!-- Webpages treat container-title like publisher -->
           <choose>
             <if variable="container-title" match="none">
-              <group delimiter=", ">
-                <text variable="genre" text-case="capitalize-first"/>
-                <text variable="medium" text-case="capitalize-first"/>
+              <group delimiter="; ">
+                <names variable="container-author">
+                  <label form="verb-short" suffix=" " text-case="title"/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                </names>
+                <names variable="editor translator" delimiter="; ">
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                  <label form="short" prefix=", " text-case="title"/>
+                </names>
               </group>
             </if>
           </choose>
-        </group>
-      </else-if>
-      <else-if type="paper-conference">
-        <group delimiter=", ">
-          <choose>
-            <if variable="collection-editor editor issue page volume" match="any">
-              <text variable="genre" text-case="capitalize-first"/>
-            </if>
-          </choose>
-          <text variable="medium" text-case="capitalize-first"/>
-        </group>
-      </else-if>
-      <else-if type="bill legislation legal_case patent treaty" match="none">
-        <choose>
-          <if variable="genre medium" match="any">
-            <group delimiter=", ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <text variable="medium" text-case="capitalize-first"/>
-            </group>
-          </if>
-          <else-if type="dataset">
-            <!-- This should be localized -->
-            <text value="Data set"/>
-          </else-if>
-        </choose>
-      </else-if>
-    </choose>
+        </if>
+        <else>
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </else>
+      </choose>
+    </group>
   </macro>
-  <macro name="description-report">
+  <macro name="database-location">
     <choose>
-      <if variable="number">
-        <group delimiter="; ">
-          <group delimiter=" ">
-            <text variable="genre" text-case="title"/>
-            <!-- Replace with term="number" if that becomes available -->
-            <text term="issue" form="short" text-case="capitalize-first"/>
-            <text variable="number"/>
-          </group>
-          <text macro="locators"/>
-        </group>
+      <if variable="archive-place" match="none">
+        <!-- With `archive-place`: physical archives. Without: online archives. -->
+        <!-- Add archive_collection as that becomes available -->
+        <text variable="archive_location"/>
       </if>
-      <else>
-        <text macro="locators"/>
-      </else>
     </choose>
   </macro>
-  <macro name="format-report">
+  <macro name="number">
     <choose>
       <if variable="number">
-        <text variable="medium" text-case="capitalize-first"/>
-      </if>
-      <else>
         <group delimiter=", ">
-          <text variable="genre" text-case="capitalize-first"/>
-          <text variable="medium" text-case="capitalize-first"/>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="archive">
-    <group delimiter=". ">
-      <group delimiter=", ">
-        <choose>
-          <if type="manuscript">
-            <text variable="genre"/>
-          </if>
-        </choose>
-        <group delimiter=" ">
-          <!-- Replace "archive" with "archive_collection" as that becomes available -->
-          <text variable="archive"/>
-          <text variable="archive_location" prefix="(" suffix=")"/>
-        </group>
-      </group>
-      <group delimiter=", ">
-        <!-- Move "archive" here when "archive_collection" becomes available -->
-        <text variable="archive-place"/>
-      </group>
-    </group>
-  </macro>
-  <macro name="publisher">
-    <choose>
-      <if type="manuscript pamphlet" match="any">
-        <choose>
-          <if variable="archive archive_location archive-place" match="any">
-            <group delimiter=". ">
-              <group delimiter=": ">
-                <text variable="publisher-place"/>
-                <text variable="publisher"/>
-              </group>
-              <text macro="archive"/>
-            </group>
-          </if>
-          <else>
-            <group delimiter=", ">
-              <text variable="genre"/>
-              <text variable="publisher"/>
-              <text variable="publisher-place"/>
-            </group>
-          </else>
-        </choose>
-      </if>
-      <else-if type="thesis" match="any">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="publisher"/>
-            <text variable="publisher-place"/>
-          </group>
-          <text macro="archive"/>
-        </group>
-      </else-if>
-      <else-if type="patent">
-        <group delimiter=". ">
-          <group delimiter=": ">
-            <text variable="publisher-place"/>
-            <text variable="publisher"/>
+          <group delimiter=" ">
+            <text variable="genre" text-case="title"/>
+            <choose>
+              <if is-numeric="number">
+                <!-- Replace with label variable="number" if that becomes available -->
+                <text term="issue" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </if>
+              <else>
+                <text variable="number"/>
+              </else>
+            </choose>
           </group>
-          <text macro="archive"/>
-        </group>
-      </else-if>
-      <else-if type="article-journal article-magazine article-newspaper" match="any">
-        <text macro="archive"/>
-      </else-if>
-      <else-if type="post post-weblog webpage" match="none">
-        <group delimiter=". ">
           <choose>
-            <if variable="event">
+            <if type="thesis">
               <choose>
-                <!-- Only print publisher info if published in a proceedings -->
-                <if variable="collection-editor editor issue page volume" match="any">
-                  <group delimiter=": ">
-                    <text variable="publisher-place"/>
-                    <text variable="publisher"/>
-                  </group>
+                <!-- Include the university in brackets if thesis is published -->
+                <if variable="archive DOI URL" match="any">
+                  <text variable="publisher"/>
                 </if>
               </choose>
             </if>
-            <else>
-              <group delimiter=": ">
-                <text variable="publisher-place"/>
-                <text variable="publisher"/>
-              </group>
-            </else>
           </choose>
-          <text macro="archive"/>
         </group>
-      </else-if>
+      </if>
     </choose>
   </macro>
-  <macro name="event">
+  <macro name="locators-booklike">
     <choose>
-      <if variable="event" type="speech paper-conference" match="any">
+      <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>
+      <else-if type="paper-conference">
         <choose>
-          <!-- Don't print event info if published in a proceedings -->
-          <if variable="collection-editor editor issue page volume" match="none">
-            <group delimiter=" ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <group delimiter=" ">
-                <choose>
-                  <if variable="genre">
-                    <text term="presented at"/>
-                  </if>
-                  <else>
-                    <text term="presented at" text-case="capitalize-first"/>
-                  </else>
-                </choose>
-                <group delimiter=", ">
-                  <text variable="event"/>
-                  <text variable="event-place"/>
-                </group>
-              </group>
+          <if variable="collection-editor editor editorial-director" match="any">
+            <group delimiter=", ">
+              <text macro="version"/>
+              <text macro="edition"/>
+              <text macro="volume-booklike"/>
             </group>
           </if>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="issued">
-    <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if variable="issued">
-        <group>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
-          <text variable="year-suffix"/>
-          <choose>
-            <if type="speech">
-              <date variable="issued" delimiter=" ">
-                <date-part prefix=", " name="month"/>
-              </date>
-            </if>
-            <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
-              <date variable="issued">
-                <date-part prefix=", " name="month"/>
-                <date-part prefix=" " name="day"/>
-              </date>
-            </else-if>
-            <else-if type="paper-conference">
-              <choose>
-                <if variable="container-title" match="none">
-                  <date variable="issued">
-                    <date-part prefix=", " name="month"/>
-                    <date-part prefix=" " name="day"/>
-                  </date>
-                </if>
-              </choose>
-            </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
-          </choose>
-        </group>
-      </else-if>
-      <else-if variable="status">
-        <group>
-          <text variable="status" text-case="lowercase"/>
-          <text variable="year-suffix" prefix="-"/>
-        </group>
+        </choose>
       </else-if>
       <else>
-        <group>
-          <text term="no date" form="short"/>
-          <text variable="year-suffix" prefix="-"/>
+        <group delimiter=", ">
+          <text macro="version"/>
+          <text macro="edition"/>
+          <text macro="volume-booklike"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="version">
+    <choose>
+      <if is-numeric="version">
+        <group delimiter=" ">
+          <!-- replace with label variable="version" if that becomes available -->
+          <text term="version" text-case="capitalize-first"/>
+          <text variable="version"/>
         </group>
+      </if>
+      <else>
+        <text variable="version"/>
       </else>
     </choose>
   </macro>
-  <macro name="issued-sort">
+  <macro name="edition">
     <choose>
-      <if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
-        <date variable="issued">
-          <date-part name="year"/>
-          <date-part name="month"/>
-          <date-part name="day"/>
-        </date>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <label variable="edition" form="short"/>
+        </group>
       </if>
       <else>
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
-  <macro name="issued-year">
-    <group>
+  <macro name="volume-booklike">
+    <group delimiter=", ">
+      <!-- Report series [ex. 52] -->
+      <choose>
+        <if type="report">
+          <group delimiter=" ">
+            <text variable="collection-title" text-case="title"/>
+            <text variable="collection-number"/>
+          </group>
+        </if>
+      </choose>
       <choose>
-        <if type="personal_communication">
+        <if variable="volume" match="any">
           <choose>
-            <if variable="archive DOI publisher URL" match="none">
-              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
-              <date variable="issued" form="text"/>
-            </if>
+            <!-- Non-numeric volumes are already printed as part of the book title -->
+            <if is-numeric="volume" match="none"/>
             <else>
-              <date variable="issued">
-                <date-part name="year"/>
-              </date>
+              <group delimiter=" ">
+                <label variable="volume" form="short" text-case="capitalize-first"/>
+                <number variable="volume" form="numeric"/>
+              </group>
             </else>
           </choose>
         </if>
         <else>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <group>
+            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <text term="page-range-delimiter" prefix="1"/>
+            <number variable="number-of-volumes" form="numeric"/>
+          </group>
         </else>
       </choose>
-      <text variable="year-suffix"/>
+      <group delimiter=" ">
+        <label variable="issue" text-case="capitalize-first"/>
+        <text variable="issue"/>
+      </group>
+      <group delimiter=" ">
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
     </group>
   </macro>
-  <macro name="issued-citation">
+  <macro name="reviewed-title">
     <choose>
-      <if variable="issued">
-        <group delimiter="/">
-          <choose>
-            <if is-uncertain-date="original-date">
-              <group prefix="[" suffix="]" delimiter=" ">
-                <text term="circa" form="short"/>
-                <date variable="original-date">
-                  <date-part name="year"/>
-                </date>
-              </group>
-            </if>
-            <else>
-              <date variable="original-date">
-                <date-part name="year"/>
-              </date>
-            </else>
-          </choose>
-          <choose>
-            <if is-uncertain-date="issued">
-              <group prefix="[" suffix="]" delimiter=" ">
-                <text term="circa" form="short"/>
-                <text macro="issued-year"/>
-              </group>
-            </if>
-            <else>
-              <text macro="issued-year"/>
-            </else>
-          </choose>
-        </group>
+      <if variable="reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed 
+              works [Ex. 69] -->
+        <text variable="reviewed-title" font-style="italic"/>
       </if>
-      <else-if variable="status">
-        <text variable="status" text-case="lowercase"/>
-        <text variable="year-suffix" prefix="-"/>
-      </else-if>
       <else>
-        <text term="no date" form="short"/>
-        <text variable="year-suffix" prefix="-"/>
+        <!-- Assume title is title of reviewed work -->
+        <text variable="title" font-style="italic"/>
       </else>
     </choose>
   </macro>
-  <macro name="original-date">
+  <macro name="reviewed-title-intext">
     <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech">
-        <date variable="original-date" delimiter=" ">
-          <date-part name="month"/>
-          <date-part name="year"/>
-        </date>
-      </else-if>
-      <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
-        <date variable="original-date" form="text"/>
-      </else-if>
+      <if variable="reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed works [Ex. 69] -->
+        <text variable="reviewed-title" form="short" font-style="italic"/>
+      </if>
       <else>
-        <date variable="original-date">
-          <date-part name="year"/>
-        </date>
+        <!-- Assume title is title of reviewed work -->
+        <text variable="title" form="short" font-style="italic"/>
       </else>
     </choose>
   </macro>
-  <macro name="original-published">
-    <!--This should be localized -->
+  <macro name="format">
     <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if type="interview motion_picture song" match="any">
-        <text value="Original work recorded"/>
+      <if variable="genre medium" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="number" match="none">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </if>
+      <!-- Generic labels for specific types -->
+      <!-- These should be localized when possible -->
+      <else-if type="dataset">
+        <text value="Data set"/>
       </else-if>
-      <else-if type="broadcast">
-        <text value="Original work broadcast"/>
+      <else-if type="book" variable="version" match="all">
+        <!-- Replace with type="software" and term="software" as that becomes available -->
+        <text value="Computer software"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="letter" text-case="capitalize-first"/>
+          </if>
+          <else-if type="interview">
+            <text term="interview" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="map">
+        <text value="Map"/>
       </else-if>
-      <else>
-        <text value="Original work published"/>
-      </else>
     </choose>
   </macro>
-  <macro name="edition">
+  <macro name="format-intext">
     <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short"/>
-        </group>
+      <if variable="genre" match="any">
+        <text variable="genre" text-case="capitalize-first"/>
       </if>
-      <else>
-        <text variable="edition"/>
-      </else>
+      <else-if variable="medium">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <!-- Generic labels for specific types -->
+      <!-- These should be localized when possible -->
+      <else-if type="dataset">
+        <text value="Data set"/>
+      </else-if>
+      <else-if type="book" variable="version" match="all">
+        <!-- Replace with type="software" and term="software" as that becomes available -->
+        <text value="Computer software"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="letter" text-case="capitalize-first"/>
+          </if>
+          <else-if type="interview">
+            <text term="interview" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="map">
+        <text value="Map"/>
+      </else-if>
     </choose>
   </macro>
-  <macro name="locators">
+  <!-- APA 'source' element contains four parts:
+        container, event, publisher, access -->
+  <macro name="container">
     <choose>
-      <if type="article-journal article-magazine figure review review-book" match="any">
-        <group delimiter=", ">
-          <group>
-            <text variable="volume" font-style="italic"/>
-            <text variable="issue" prefix="(" suffix=")"/>
-          </group>
-          <text variable="page"/>
-        </group>
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <!-- Periodical items -->
+        <text macro="container-periodical"/>
       </if>
-      <else-if type="article-newspaper">
-        <group delimiter=" ">
-          <label variable="page" form="short"/>
-          <text variable="page"/>
-        </group>
-      </else-if>
       <else-if type="paper-conference">
+        <!-- Determine if paper-conference is a periodical or booklike -->
         <choose>
-          <if variable="collection-editor editor" match="any">
-            <text macro="locators-booklike"/>
+          <if variable="editor editorial-director collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
           </if>
           <else>
-            <group delimiter=", ">
-              <group>
-                <text variable="volume" font-style="italic"/>
-                <text variable="issue" prefix="(" suffix=")"/>
-              </group>
-              <text variable="page"/>
-            </group>
+            <text macro="container-periodical"/>
           </else>
         </choose>
       </else-if>
-      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
-        <text macro="locators-booklike"/>
+      <else-if type="post webpage" match="none">
+        <!-- post and webpage treat container-title like publisher -->
+        <text macro="container-booklike"/>
       </else-if>
     </choose>
   </macro>
-  <macro name="locators-booklike">
-    <group delimiter=", ">
-      <text macro="edition"/>
-      <group delimiter=" ">
-        <text term="version" text-case="capitalize-first"/>
-        <text variable="version"/>
+  <macro name="container-periodical">
+    <group delimiter=". ">
+      <group delimiter=", ">
+        <text variable="container-title" font-style="italic" text-case="title"/>
+        <choose>
+          <if variable="volume">
+            <group>
+              <text variable="volume" font-style="italic"/>
+              <text variable="issue" prefix="(" suffix=")"/>
+            </group>
+          </if>
+          <else>
+            <text variable="issue" font-style="italic"/>
+          </else>
+        </choose>
+        <choose>
+          <if variable="page">
+            <text variable="page"/>
+          </if>
+          <else>
+            <!-- Ex. 6: Journal article with article number or eLocator -->
+            <!-- This should be localized -->
+            <text variable="number" prefix="Article "/>
+          </else>
+        </choose>
       </group>
       <choose>
-        <if variable="volume" match="any">
+        <if variable="issued">
           <choose>
-            <if is-numeric="volume" match="none"/>
-            <else-if variable="collection-title">
-              <choose>
-                <if variable="editor translator" match="none">
-                  <choose>
-                    <if variable="collection-number">
-                      <group>
-                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                        <number variable="volume" form="numeric"/>
-                      </group>
-                    </if>
-                  </choose>
-                </if>
-              </choose>
-            </else-if>
-            <else>
-              <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
-              </group>
-            </else>
+            <if variable="issue page volume" match="none">
+              <text variable="status" text-case="capitalize-first"/>
+            </if>
           </choose>
         </if>
-        <else>
-          <group>
-            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
-          </group>
-        </else>
-      </choose>
-      <group>
-        <label variable="page" form="short" suffix=" "/>
-        <text variable="page"/>
-      </group>
-    </group>
-  </macro>
-  <macro name="citation-locator">
-    <group>
-      <choose>
-        <if locator="chapter">
-          <label variable="locator" text-case="capitalize-first"/>
-        </if>
-        <else>
-          <label variable="locator" form="short"/>
-        </else>
       </choose>
-      <text variable="locator" prefix=" "/>
     </group>
   </macro>
-  <macro name="container">
+  <macro name="container-booklike">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
-        <group delimiter=", ">
-          <text macro="container-title"/>
-          <text macro="locators"/>
-        </group>
-        <choose>
-          <!--for advance online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
-      </if>
-      <else-if type="article dataset figure" match="any">
-        <choose>
-          <if variable="container-title">
-            <group delimiter=", ">
-              <text macro="container-title"/>
-              <text macro="locators"/>
-            </group>
-            <choose>
-              <!--for advance online publication-->
-              <if variable="issued">
-                <choose>
-                  <if variable="page issue" match="none">
-                    <text variable="status" text-case="capitalize-first" prefix=". "/>
-                  </if>
-                </choose>
-              </if>
-            </choose>
-          </if>
-        </choose>
-      </else-if>
-      <!-- book is here to catch software with container titles -->
-      <else-if type="book" variable="container-title" match="all">
+      <if variable="container-title" match="any">
         <group delimiter=" ">
-          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <text term="in" text-case="capitalize-first"/>
           <group delimiter=", ">
-            <text macro="container-contributors"/>
-            <group delimiter=" ">
-              <text macro="container-title"/>
-              <text macro="description-report" prefix="(" suffix=")"/>
-              <text macro="format-report" prefix="[" suffix="]"/>
+            <names variable="editor translator" delimiter=", &amp; ">
+              <!-- Change to editortranslator and move editor to substitute as that becomes available -->
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" text-case="title" prefix=" (" suffix=")"/>
+              <substitute>
+                <names variable="editorial-director"/>
+                <names variable="collection-editor"/>
+                <names variable="container-author"/>
+              </substitute>
+            </names>
+            <group delimiter=": " font-style="italic">
+              <text variable="container-title"/>
+              <!-- Replace with volume-title as that becomes available -->
+              <choose>
+                <if is-numeric="volume" match="none">
+                  <group delimiter=" ">
+                    <label variable="volume" form="short" text-case="capitalize-first"/>
+                    <text variable="volume"/>
+                  </group>
+                </if>
+              </choose>
             </group>
           </group>
+          <text macro="parenthetical-container"/>
+          <text macro="bracketed-container"/>
         </group>
-      </else-if>
-      <else-if type="report" variable="container-title" match="all">
-        <group delimiter=" ">
-          <text term="in" text-case="capitalize-first" suffix=" "/>
-          <group delimiter=", ">
-            <text macro="container-contributors"/>
-            <group delimiter=" ">
-              <text macro="container-title"/>
-              <text macro="description-report" prefix="(" suffix=")"/>
-              <text macro="format-report" prefix="[" suffix="]"/>
-            </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <choose>
+        <if type="thesis">
+          <choose>
+            <if variable="archive DOI URL" match="none">
+              <text variable="publisher"/>
+            </if>
+          </choose>
+        </if>
+        <else-if type="post webpage">
+          <!-- For websites, treat container title like publisher -->
+          <group delimiter="; ">
+            <text variable="container-title" text-case="title"/>
+            <text variable="publisher"/>
           </group>
-        </group>
-      </else-if>
-      <else-if type="song" variable="container-title" match="all">
+        </else-if>
+        <else-if type="paper-conference">
+          <!-- For paper-conference, don't print publisher if in a journal-like proceedings -->
+          <choose>
+            <if variable="collection-editor editor editorial-director" match="any">
+              <text variable="publisher"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article-journal article-magazine article-newspaper post-weblog" match="none">
+          <text variable="publisher"/>
+        </else-if>
+      </choose>
+      <group delimiter=", ">
+        <choose>
+          <if variable="archive-place">
+            <!-- With `archive-place`: physical archives. Without: online archives. -->
+            <!-- For physical archives, print the location before the archive name.
+                For electronic archives, these are printed in macro="description". -->
+            <!-- Split "archive_location" into "archive_collection" and "archive_location" as that becomes available -->
+            <!-- Must test for archive_collection:
+                With collection: archive_collection (archive_location), archive, archive-place
+                No collection: archive (archive_location), archive-place
+            -->
+            <text variable="archive_location"/>
+          </if>
+        </choose>
+        <text variable="archive"/>
+        <text variable="archive-place"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else-if variable="URL">
         <group delimiter=" ">
-          <text term="in" text-case="capitalize-first" suffix=" "/>
-          <group delimiter=", ">
-            <text macro="container-contributors"/>
-            <group delimiter=" ">
-              <text macro="container-title"/>
-              <text macro="locators" prefix="(" suffix=")"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="genre" text-case="capitalize-first"/>
-                <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="issued status" match="none">
+              <group delimiter=" ">
+                <text term="retrieved" text-case="capitalize-first"/>
+                <date variable="accessed" form="text" suffix=","/>
+                <text term="from"/>
               </group>
-            </group>
-          </group>
+            </if>
+          </choose>
+          <text variable="URL"/>
         </group>
       </else-if>
-      <else-if type="paper-conference">
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
-          <if variable="editor collection-editor container-author" match="any">
-            <text macro="container-booklike"/>
-          </if>
-          <else>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <!-- Don't print event info if published in a proceedings -->
             <group delimiter=", ">
-              <text macro="container-title"/>
-              <text macro="locators"/>
+              <text variable="event"/>
+              <text variable="event-place"/>
             </group>
-          </else>
-        </choose>
-      </else-if>
-      <else-if type="book">
-        <choose>
-          <!-- book and software should not cite collection-title, only container-title -->
-          <if variable="container-title">
-            <text macro="container-booklike"/>
           </if>
         </choose>
-      </else-if>
-      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
-        <text macro="container-booklike"/>
-      </else-if>
-      <else-if type="bill legal_case legislation treaty" match="any">
-        <text macro="legal-cites"/>
-      </else-if>
+      </if>
     </choose>
   </macro>
-  <macro name="container-booklike">
+  <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
+  <macro name="publication-history">
     <choose>
-      <if variable="container-title collection-title" match="any">
-        <group delimiter=" ">
-          <text term="in" text-case="capitalize-first"/>
+      <if type="patent" match="none">
+        <group prefix="(" suffix=")">
+          <choose>
+            <if variable="references">
+              <!-- This provides the option for more elaborate description 
+                    of publication history, such as full "reprinted" references
+                    (examples 11, 43, 44) or retracted references -->
+              <text variable="references"/>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text value="Original work published"/>
+                <choose>
+                  <if is-uncertain-date="original-date">
+                    <text term="circa" form="short"/>
+                  </if>
+                </choose>
+                <date variable="original-date">
+                  <date-part name="year"/>
+                </date>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else>
+        <text variable="references" prefix="(" suffix=")"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- Legal citations have their own rules -->
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+            </group>
+            <text variable="references"/>
+          </group>
+          <text macro="access"/>
+        </group>
+      </if>
+      <else-if type="bill">
+        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+        <group delimiter=". ">
           <group delimiter=", ">
-            <text macro="container-contributors"/>
             <choose>
-              <if variable="container-author editor translator" match="none">
-                <group delimiter=". ">
-                  <group delimiter=": ">
-                    <text variable="collection-title" font-style="italic" text-case="title"/>
-                    <choose>
-                      <if variable="collection-title">
-                        <group delimiter=" ">
-                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                          <number variable="collection-number" font-style="italic" form="numeric"/>
-                          <choose>
-                            <if variable="collection-number" match="none">
-                              <number variable="volume" font-style="italic" form="numeric"/>
-                            </if>
-                          </choose>
-                        </group>
-                      </if>
-                    </choose>
-                  </group>
-                  <!-- Replace with volume-title as that becomes available -->
-                  <group delimiter=": ">
-                    <text macro="container-title"/>
-                    <choose>
-                      <if variable="collection-title" is-numeric="volume" match="none">
-                        <group delimiter=" ">
-                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                          <text variable="volume" font-style="italic"/>
-                        </group>
-                      </if>
-                    </choose>
-                  </group>
-                </group>
+              <if variable="number container-title" match="none">
+                <!-- If no number or container-title, then assume it is a hearing -->
+                <text variable="title" font-style="italic"/>
               </if>
               <else>
-                <!-- Replace with volume-title as that becomes available -->
-                <group delimiter=": ">
-                  <text macro="container-title"/>
-                  <choose>
-                    <if is-numeric="volume" match="none">
-                      <group delimiter=" ">
-                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                        <text variable="volume" font-style="italic"/>
-                      </group>
-                    </if>
-                  </choose>
-                </group>
+                <text variable="title"/>
               </else>
             </choose>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <choose>
+                <if variable="number container-title" match="none">
+                  <!-- If no number or container-title, then assume it is a hearing -->
+                  <names variable="author" prefix="(testimony of " suffix=")">
+                    <name and="symbol" delimiter=", "/>
+                  </names>
+                </if>
+                <else>
+                  <text variable="status" prefix="(" suffix=")"/>
+                </else>
+              </choose>
+            </group>
+            <text variable="references"/>
           </group>
-          <group delimiter="; " prefix="(" suffix=")">
-            <text macro="locators"/>
-            <names variable="container-author">
-              <label form="verb-short" suffix=" " text-case="title"/>
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-            </names>
+          <text macro="access"/>
+        </group>
+      </else-if>
+      <else-if type="legislation">
+        <!-- Currently designed to handle statutes, codified regulations, executive orders.
+              For uncodified regulations, assume future code section is in status. -->
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <text variable="status" prefix="(" suffix=")"/>
+            </group>
+            <text variable="references"/>
           </group>
+          <text macro="access"/>
         </group>
-      </if>
+      </else-if>
+      <else-if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+              explanation for treaty items. The Bluebook format that was used in APA 6th
+              ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
+          <text macro="access"/>
+        </group>
+      </else-if>
     </choose>
   </macro>
-  <macro name="container-title">
+  <macro name="date-legal">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper dataset" match="any">
-        <text variable="container-title" font-style="italic" text-case="title"/>
+      <if type="legal_case">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <text variable="authority"/>
+          <choose>
+            <if variable="container-title" match="any">
+              <!-- Print only year for cases published in reporters-->
+              <date variable="issued" form="numeric" date-parts="year"/>
+            </if>
+            <else>
+              <date variable="issued" form="text"/>
+            </else>
+          </choose>
+        </group>
       </if>
-      <else-if type="paper-conference speech">
-        <choose>
-          <if variable="collection-editor container-author editor" match="any">
-            <text variable="container-title" font-style="italic"/>
-          </if>
-          <else>
-            <text variable="container-title" font-style="italic" text-case="title"/>
-          </else>
-        </choose>
+      <else-if type="bill legislation" match="any">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <group delimiter=" ">
+            <date variable="original-date">
+              <date-part name="year"/>
+            </date>
+            <text term="and" form="symbol"/>
+          </group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
       </else-if>
-      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
-        <text variable="container-title" font-style="italic"/>
+      <else-if type="treaty">
+        <date variable="issued" form="text"/>
       </else-if>
     </choose>
   </macro>
-  <macro name="legal-cites">
+  <macro name="container-legal">
+    <!-- Expect legal item container-titles to be stored in short form -->
     <choose>
       <if type="legal_case">
-        <group prefix=", " delimiter=" ">
-          <group delimiter=" ">
-            <choose>
-              <if variable="container-title">
+        <group delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <group delimiter=" ">
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!--change to label variable="section" as that becomes available -->
+                  <!-- Change to label variable="section" as that becomes available -->
                   <text term="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
-                <text variable="page"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <choose>
-                    <if is-numeric="number">
-                      <!-- Replace with term="number" if that becomes available -->
-                      <text term="issue" form="short" text-case="capitalize-first"/>
-                    </if>
-                  </choose>
-                  <text variable="number"/>
-                </group>
-              </else>
-            </choose>
-          </group>
-          <group prefix="(" suffix=")" delimiter=" ">
-            <text variable="authority"/>
-            <choose>
-              <if variable="container-title" match="any">
-                <!--Only print year for cases published in reporters-->
-                <date variable="issued" form="numeric" date-parts="year"/>
-              </if>
-              <else>
-                <date variable="issued" form="text"/>
-              </else>
-            </choose>
-          </group>
+                <choose>
+                  <if variable="page page-first" match="any">
+                    <text variable="page-first"/>
+                  </if>
+                  <else>
+                    <text value="___"/>
+                  </else>
+                </choose>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <choose>
+                  <if is-numeric="number">
+                    <!-- Replace with label variable="number" if that becomes available -->
+                    <text term="issue" form="short" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
-        <group prefix=", " delimiter=" ">
-          <group delimiter=", ">
-            <choose>
-              <if variable="number">
-                <!--There's a public law number-->
-                <text variable="number" prefix="Pub. L. No. "/>
-                <group delimiter=" ">
-                  <!--change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
-                  <text variable="section"/>
-                </group>
-                <group delimiter=" ">
-                  <text variable="volume"/>
-                  <text variable="container-title"/>
-                  <text variable="page-first"/>
-                </group>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="volume"/>
-                  <text variable="container-title"/>
-                  <!--change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
-                  <text variable="section"/>
-                </group>
-              </else>
-            </choose>
+      <else-if type="bill">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <group delimiter=" ">
+              <choose>
+                <if variable="chapter-number container-title" match="none">
+                  <!-- Replace with label variable="number" as that becomes available -->
+                  <text term="issue" form="short"/>
+                </if>
+              </choose>
+              <text variable="number"/>
+            </group>
+          </group>
+          <text variable="authority"/>
+          <text variable="chapter-number"/>
+          <group delimiter=" ">
+            <text variable="volume"/>
+            <text variable="container-title"/>
+            <text variable="page-first"/>
           </group>
-          <date variable="issued" prefix="(" suffix=")">
-            <date-part name="year"/>
-          </date>
         </group>
       </else-if>
+      <else-if type="legislation">
+        <choose>
+          <if variable="number">
+            <!--There's a public law number-->
+            <group delimiter=", ">
+              <text variable="number" prefix="Pub. L. No. "/>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <text variable="page-first"/>
+              </group>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="volume"/>
+              <text variable="container-title"/>
+              <choose>
+                <if variable="section">
+                  <group delimiter=" ">
+                    <!-- Change to label variable="section" as that becomes available -->
+                    <text term="section" form="symbol"/>
+                    <text variable="section"/>
+                  </group>
+                </if>
+                <else>
+                  <text variable="page-first"/>
+                </else>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else-if>
       <else-if type="treaty">
         <group delimiter=" ">
           <number variable="volume"/>
           <text variable="container-title"/>
-          <text variable="page"/>
+          <choose>
+            <if variable="page page-first" match="any">
+              <text variable="page-first"/>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <!-- Replace with label variable="number" if that becomes available -->
+                <text term="issue" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
         </group>
       </else-if>
     </choose>
   </macro>
-  <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
+  <macro name="citation-locator">
+    <group delimiter=" ">
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
     <sort>
-      <key macro="author" names-min="8" names-use-first="6"/>
-      <key macro="issued-sort"/>
+      <key macro="author-bib" names-min="21" names-use-first="19"/>
+      <key macro="date-sort-group"/>
+      <key macro="date-sort-date" sort="ascending"/>
+      <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
-        <text macro="author-short"/>
-        <text macro="issued-citation"/>
+        <text macro="author-intext"/>
+        <text macro="date-intext"/>
         <text macro="citation-locator"/>
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0">
+  <bibliography hanging-indent="true" et-al-min="21" et-al-use-first="19" et-al-use-last="true" entry-spacing="0" line-spacing="1">
     <sort>
-      <key macro="author"/>
-      <key macro="issued-sort" sort="ascending"/>
+      <key macro="author-bib"/>
+      <key macro="date-sort-group"/>
+      <key macro="date-sort-date" sort="ascending"/>
+      <key variable="status"/>
       <key macro="title"/>
     </sort>
     <layout>
-      <group suffix=".">
-        <group delimiter=". ">
-          <text macro="author"/>
+      <choose>
+        <if type="bill legal_case legislation treaty" match="any">
+          <!-- Legal items have different orders and delimiters -->
           <choose>
-            <if is-uncertain-date="issued">
-              <group prefix=" [" suffix="]" delimiter=" ">
-                <text term="circa" form="short"/>
-                <text macro="issued"/>
-              </group>
+            <if variable="DOI URL" match="any">
+              <text macro="legal-cites"/>
             </if>
             <else>
-              <text macro="issued" prefix=" (" suffix=")"/>
+              <text macro="legal-cites" suffix="."/>
             </else>
           </choose>
-          <group delimiter=" ">
-            <text macro="title"/>
-            <choose>
-              <if variable="title interviewer" type="interview" match="any">
-                <group delimiter=" ">
-                  <text macro="description"/>
-                  <text macro="format"/>
-                </group>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text macro="format"/>
-                  <text macro="description"/>
-                </group>
-              </else>
-            </choose>
-          </group>
-          <text macro="container"/>
-        </group>
-        <text macro="event" prefix=". "/>
-      </group>
-      <text macro="access" prefix=" "/>
-      <choose>
-        <if is-uncertain-date="original-date">
-          <group prefix=" [" suffix="]" delimiter=" ">
-            <text macro="original-published"/>
-            <text term="circa" form="short"/>
-            <text macro="original-date"/>
-          </group>
         </if>
-        <else-if variable="original-date">
-          <group prefix=" (" suffix=")" delimiter=" ">
-            <text macro="original-published"/>
-            <text macro="original-date"/>
+        <else>
+          <group delimiter=" ">
+            <group delimiter=". " suffix=".">
+              <text macro="author-bib"/>
+              <text macro="date-bib"/>
+              <text macro="title-and-descriptions"/>
+              <text macro="container"/>
+              <text macro="event"/>
+              <text macro="publisher"/>
+            </group>
+            <text macro="access"/>
+            <text macro="publication-history"/>
           </group>
-        </else-if>
+        </else>
       </choose>
     </layout>
   </bibliography>
-</style>
+</style>
\ No newline at end of file
diff --git a/apa.csl b/apa.csl
index 700cfc677548..0c0ed3caa30d 100644
--- a/apa.csl
+++ b/apa.csl
@@ -1,37 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
   <info>
-    <title>American Psychological Association 6th edition</title>
+    <title>American Psychological Association 7th edition</title>
     <title-short>APA</title-short>
     <id>http://www.zotero.org/styles/apa</id>
     <link href="http://www.zotero.org/styles/apa" rel="self"/>
-    <link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/apa-6th-edition" rel="template"/>
+    <link href="https://apastyle.apa.org/style-grammar-guidelines/references/examples" rel="documentation"/>
     <author>
-      <name>Simon Kornblith</name>
-      <email>simon@simonster.com</email>
-    </author>
-    <author>
-      <name> Brenton M. Wiernik</name>
+      <name>Brenton M. Wiernik</name>
       <email>zotero@wiernik.org</email>
     </author>
-    <contributor>
-      <name>Bruce D'Arcus</name>
-    </contributor>
-    <contributor>
-      <name>Curtis M. Humphrey</name>
-    </contributor>
-    <contributor>
-      <name>Richard Karnesky</name>
-      <email>karnesky+zotero@gmail.com</email>
-      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
-    </contributor>
-    <contributor>
-      <name>Sebastian Karcher</name>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <updated>2016-09-28T13:09:49+00:00</updated>
+    <updated>2019-12-04T13:09:49+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -41,14 +24,28 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
-      <term name="interviewer" form="short">interviewer</term>
+      <term name="interviewer" form="short">
+        <single>interviewer</single>
+        <multiple>interviewers</multiple>
+      </term>
+      <term name="collection-editor" form="short">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
       <term name="circa" form="short">ca.</term>
-      <term name="collection-editor" form="short">series ed.</term>
+      <term name="bc"> B.C.E.</term>
+      <term name="ad"> C.E.</term>
+      <term name="letter">personal communication</term>
+      <term name="letter" form="short">letter</term>
+      <term name="issue" form="long">
+        <single>issue</single>
+        <multiple>issues</multiple>
+      </term>
     </terms>
   </locale>
-  <locale xml:lang="es">
+  <locale xml:lang="da">
     <terms>
-      <term name="from">de</term>
+      <term name="et-al">et al.</term>
     </terms>
   </locale>
   <locale xml:lang="de">
@@ -56,1471 +53,1615 @@
       <term name="et-al">et al.</term>
     </terms>
   </locale>
-  <locale xml:lang="da">
+  <locale xml:lang="es">
     <terms>
-      <term name="et-al">et al.</term>
+      <term name="from">de</term>
     </terms>
   </locale>
-  <locale xml:lang="nn">
+  <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
     </terms>
   </locale>
-  <locale xml:lang="nb">
+  <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
     </terms>
   </locale>
-  <macro name="container-contributors-booklike">
-    <choose>
-      <if variable="container-title">
-        <names variable="editor translator" delimiter=", &amp; ">
-          <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          <substitute>
-            <names variable="editorial-director"/>
-            <names variable="collection-editor"/>
-            <names variable="container-author"/>
-          </substitute>
-        </names>
-      </if>
-    </choose>
-  </macro>
-  <macro name="container-contributors">
-    <choose>
-      <!-- book is here to catch software with container titles -->
-      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
-        <text macro="container-contributors-booklike"/>
-      </if>
-      <else-if type="paper-conference">
-        <choose>
-          <if variable="collection-editor container-author editor" match="any">
-            <text macro="container-contributors-booklike"/>
-          </if>
-        </choose>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="secondary-contributors-booklike">
-    <group delimiter="; ">
-      <choose>
-        <if variable="title">
-          <names variable="interviewer">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-        </if>
-      </choose>
-      <choose>
-        <if variable="container-title" match="none">
-          <group delimiter="; ">
-            <names variable="container-author">
-              <label form="verb-short" suffix=" " text-case="title"/>
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-            </names>
-            <names variable="editor translator" delimiter="; ">
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-              <label form="short" prefix=", " text-case="title"/>
-            </names>
-          </group>
-        </if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="secondary-contributors">
-    <choose>
-      <!-- book is here to catch software with container titles -->
-      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
-        <text macro="secondary-contributors-booklike"/>
-      </if>
-      <else-if type="personal_communication">
-        <group delimiter="; ">
-          <group delimiter=" ">
-            <choose>
-              <if variable="genre" match="any">
-                <text variable="genre" text-case="capitalize-first"/>
-              </if>
-              <else>
-                <text term="letter" text-case="capitalize-first"/>
-              </else>
-            </choose>
-            <names variable="recipient" delimiter=", ">
-              <label form="verb" suffix=" "/>
-              <name and="symbol" delimiter=", "/>
-            </names>
-          </group>
-          <text variable="medium" text-case="capitalize-first"/>
-          <choose>
-            <if variable="container-title" match="none">
-              <names variable="editor translator" delimiter="; ">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </if>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="song">
-        <choose>
-          <if variable="original-author composer" match="any">
-            <group delimiter="; ">
-              <!-- Replace prefix with performer label as that becomes available -->
-              <names variable="author" prefix="Recorded by ">
-                <label form="verb" text-case="title"/>
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-              </names>
-              <names variable="translator">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </group>
-          </if>
-        </choose>
-      </else-if>
-      <else-if type="article-journal article-magazine article-newspaper" match="any">
-        <group delimiter="; ">
-          <choose>
-            <if variable="title">
-              <names variable="interviewer" delimiter="; ">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </if>
-          </choose>
-          <names variable="translator" delimiter="; ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-        </group>
-      </else-if>
-      <else-if type="paper-conference">
-        <choose>
-          <if variable="collection-editor editor" match="any">
-            <text macro="secondary-contributors-booklike"/>
-          </if>
-          <else>
-            <group delimiter="; ">
-              <choose>
-                <if variable="title">
-                  <names variable="interviewer" delimiter="; ">
-                    <name and="symbol" initialize-with=". " delimiter=", "/>
-                    <label form="short" prefix=", " text-case="title"/>
-                  </names>
-                </if>
-              </choose>
-              <names variable="translator" delimiter="; ">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </group>
-          </else>
-        </choose>
-      </else-if>
-      <else>
-        <group delimiter="; ">
-          <choose>
-            <if variable="title">
-              <names variable="interviewer">
-                <name and="symbol" initialize-with=". " delimiter="; "/>
-                <label form="short" prefix=", " text-case="title"/>
-              </names>
-            </if>
-          </choose>
-          <names variable="editor translator" delimiter="; ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="author">
-    <choose>
-      <if type="song">
-        <names variable="composer" delimiter=", ">
+  <!-- General categories of item types:
+       Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
+       Periodical or Booklike: paper-conference
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+                 personal_communication report song speech thesis post webpage
+       Legal: bill legal_case legislation treaty
+  -->
+  <!-- APA references contain four parts: author, date, title, source -->
+  <macro name="author-bib">
+    <names variable="composer" delimiter=", ">
+      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <substitute>
+        <names variable="author"/>
+        <names variable="illustrator"/>
+        <names variable="director">
           <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-          <substitute>
-            <names variable="original-author"/>
-            <names variable="author"/>
-            <names variable="translator">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <group delimiter=" ">
-              <text macro="title"/>
-              <text macro="description"/>
-              <text macro="format"/>
-            </group>
-          </substitute>
+          <label form="long" prefix=" (" suffix=")" text-case="title"/>
         </names>
-      </if>
-      <else-if type="treaty"/>
-      <else>
-        <names variable="author" delimiter=", ">
-          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-          <substitute>
-            <names variable="illustrator"/>
-            <names variable="composer"/>
-            <names variable="director">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="long" prefix=" (" suffix=")" text-case="title"/>
-            </names>
+        <choose>
+          <if variable="container-title">
             <choose>
-              <if variable="container-title">
+              <if type="book entry entry-dictionary entry-encyclopedia" match="any">
                 <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia">
-                    <text macro="title"/>
+                  <if variable="title">
+                    <group delimiter=" ">
+                      <text macro="title"/>
+                      <text macro="parenthetical"/>
+                    </group>
                   </if>
                   <else>
-                    <names variable="translator"/>
+                    <text macro="title-and-descriptions"/>
                   </else>
                 </choose>
-                <names variable="translator">
-                  <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-                  <label form="short" prefix=" (" suffix=")" text-case="title"/>
-                </names>
-              </if>
-            </choose>
-            <names variable="editor translator" delimiter=", ">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <names variable="editorial-director">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <names variable="collection-editor">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
-            </names>
-            <choose>
-              <if type="report">
-                <text variable="publisher"/>
               </if>
             </choose>
+          </if>
+        </choose>
+        <!-- Test for editortranslator and put that first as that becomes available -->
+        <names variable="editor" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="editorial-director">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="collection-editor">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <choose>
+          <if variable="title">
             <group delimiter=" ">
               <text macro="title"/>
-              <text macro="description"/>
-              <text macro="format"/>
+              <text macro="parenthetical"/>
             </group>
-          </substitute>
-        </names>
-      </else>
-    </choose>
+          </if>
+          <else>
+            <text macro="title-and-descriptions"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
   </macro>
-  <macro name="author-short">
+  <macro name="author-intext">
     <choose>
-      <if type="patent" variable="number" match="all">
-        <text macro="patent-number"/>
+      <if type="bill legal_case legislation treaty" match="any">
+        <text macro="title-intext"/>
       </if>
-      <else-if type="treaty">
-        <text variable="title" form="short"/>
-      </else-if>
-      <else-if type="personal_communication">
+      <else-if type="interview personal_communication">
         <choose>
-          <if variable="archive DOI publisher URL" match="none">
+          <!-- These variables indicate that the letter is retrievable by the reader. 
+                If not, then use the APA in-text-only personal communication format -->
+          <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
               <names variable="author">
                 <name and="symbol" delimiter=", " initialize-with=". "/>
                 <substitute>
-                  <text variable="title" form="short" quotes="true"/>
+                  <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- This should be localized -->
-              <text value="personal communication"/>
+              <!-- Replace with term="personal-communication" if that becomes available -->
+              <text term="letter"/>
             </group>
           </if>
           <else>
             <names variable="author" delimiter=", ">
               <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
               <substitute>
-                <names variable="editor"/>
-                <names variable="translator"/>
-                <choose>
-                  <if variable="container-title">
-                    <text variable="title" form="short" quotes="true"/>
-                  </if>
-                  <else>
-                    <text variable="title" form="short" font-style="italic"/>
-                  </else>
-                </choose>
-                <text macro="format-short" prefix="[" suffix="]"/>
+                <text macro="title-intext"/>
               </substitute>
             </names>
           </else>
         </choose>
       </else-if>
-      <else-if type="song">
+      <else>
         <names variable="composer" delimiter=", ">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
           <substitute>
-            <names variable="original-author"/>
             <names variable="author"/>
-            <names variable="translator"/>
-            <choose>
-              <if variable="container-title">
-                <text variable="title" form="short" quotes="true"/>
-              </if>
-              <else>
-                <text variable="title" form="short" font-style="italic"/>
-              </else>
-            </choose>
-            <text macro="format-short" prefix="[" suffix="]"/>
-          </substitute>
-        </names>
-      </else-if>
-      <else>
-        <names variable="author" delimiter=", ">
-          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
-          <substitute>
             <names variable="illustrator"/>
-            <names variable="composer"/>
             <names variable="director"/>
             <choose>
               <if variable="container-title">
                 <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia">
-                    <text variable="title" form="short" quotes="true"/>
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
+                    <text macro="title-intext"/>
                   </if>
-                  <else>
-                    <names variable="translator"/>
-                  </else>
                 </choose>
               </if>
             </choose>
             <names variable="editor"/>
             <names variable="editorial-director"/>
-            <names variable="translator"/>
-            <choose>
-              <if type="report" variable="publisher" match="all">
-                <text variable="publisher"/>
-              </if>
-              <else-if type="legal_case">
-                <text variable="title" font-style="italic"/>
-              </else-if>
-              <else-if type="bill legislation" match="any">
-                <text variable="title" form="short"/>
-              </else-if>
-              <else-if variable="reviewed-author" type="review review-book" match="any">
-                <text macro="format-short" prefix="[" suffix="]"/>
-              </else-if>
-              <else-if type="post post-weblog webpage" variable="container-title" match="any">
-                <text variable="title" form="short" quotes="true"/>
-              </else-if>
-              <else>
-                <text variable="title" form="short" font-style="italic"/>
-              </else>
-            </choose>
-            <text macro="format-short" prefix="[" suffix="]"/>
+            <text macro="title-intext"/>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
-  <macro name="patent-number">
-    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
-    <group delimiter=" ">
-      <text variable="authority"/>
+  <macro name="date-bib">
+    <group delimiter=" " prefix="(" suffix=")">
       <choose>
-        <if variable="genre">
-          <text variable="genre" text-case="capitalize-first"/>
+        <if is-uncertain-date="issued">
+          <text term="circa" form="short"/>
         </if>
-        <else>
-          <!-- This should be localized -->
-          <text value="patent" text-case="capitalize-first"/>
-        </else>
       </choose>
-      <group delimiter=" ">
-        <text term="issue" form="short" text-case="capitalize-first"/>
-        <text variable="number"/>
-      </group>
-    </group>
-  </macro>
-  <macro name="access">
-    <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if variable="DOI" match="any">
-        <text variable="DOI" prefix="https://doi.org/"/>
-      </else-if>
-      <else-if variable="URL">
-        <group delimiter=" ">
-          <text term="retrieved" text-case="capitalize-first"/>
-          <choose>
-            <if type="post post-weblog webpage" match="any">
-              <date variable="accessed" form="text" suffix=","/>
-            </if>
-          </choose>
-          <text term="from"/>
-          <choose>
-            <if type="report">
-              <choose>
-                <if variable="author editor translator" match="any">
-                  <!-- This should be localized -->
-                  <text variable="publisher" suffix=" website:"/>
-                </if>
-              </choose>
-            </if>
-            <else-if type="post post-weblog webpage" match="any">
-              <!-- This should be localized -->
-              <text variable="container-title" suffix=" website:"/>
-            </else-if>
-          </choose>
-          <text variable="URL"/>
-        </group>
-      </else-if>
-      <else-if variable="archive">
+      <group>
         <choose>
-          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
-            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
+          <if variable="issued">
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+            <text variable="year-suffix"/>
             <choose>
-              <if variable="archive-place" match="none">
-                <group delimiter=" ">
-                  <text term="retrieved" text-case="capitalize-first"/>
-                  <text term="from"/>
-                  <text variable="archive" suffix="."/>
-                  <text variable="archive_location" prefix="(" suffix=")"/>
-                </group>
+              <if type="article-magazine article-newspaper broadcast interview motion_picture pamphlet personal_communication post post-weblog song speech webpage" match="any">
+                <!-- Many video and audio examples in manual give full dates. Err on the side of too much information. -->
+                <date variable="issued">
+                  <date-part prefix=", " name="month"/>
+                  <date-part prefix=" " name="day"/>
+                </date>
               </if>
-              <else>
-                <text macro="publisher" suffix="."/>
-              </else>
+              <else-if type="paper-conference">
+                <!-- Capture 'speech' stored as 'paper-conference' -->
+                <choose>
+                  <if variable="collection-editor editor editorial-director issue page volume" match="none">
+                    <date variable="issued">
+                      <date-part prefix=", " name="month"/>
+                      <date-part prefix=" " name="day"/>
+                    </date>
+                  </if>
+                </choose>
+              </else-if>
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+                   manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
+          <else-if variable="status">
+            <group>
+              <text variable="status" text-case="lowercase"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
+          </else-if>
           <else>
-            <text macro="publisher" suffix="."/>
+            <group>
+              <text term="no date" form="short"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
           </else>
         </choose>
-      </else-if>
-      <else>
-        <text macro="publisher" suffix="."/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="title">
+      </group>
+    </group>
+  </macro>
+  <macro name="date-sort-group">
     <choose>
-      <if type="treaty">
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
+      <if variable="issued">
+        <text value="1"/>
+      </if>
+      <else-if variable="status">
+        <text value="2"/>
+      </else-if>
+      <else>
+        <text value="0"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-sort-date">
+    <choose>
+      <if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
+        <date variable="issued" form="numeric"/>
+      </if>
+      <else-if type="paper-conference">
+        <!-- Capture 'speech' stored as 'paper-conference' -->
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <date variable="issued" form="numeric"/>
+          </if>
+        </choose>
+      </else-if>
+      <else>
+        <date variable="issued" form="numeric"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-intext">
+    <choose>
+      <if variable="issued">
+        <group delimiter="/">
+          <group delimiter=" ">
+            <choose>
+              <if is-uncertain-date="original-date">
+                <text term="circa" form="short"/>
+              </if>
+            </choose>
+            <date variable="original-date">
+              <date-part name="year"/>
+            </date>
+          </group>
+          <group delimiter=" ">
+            <choose>
+              <if is-uncertain-date="issued">
+                <text term="circa" form="short"/>
+              </if>
+            </choose>
+            <group>
+              <choose>
+                <if type="interview personal_communication">
+                  <choose>
+                    <if variable="archive container-title DOI publisher URL" match="none">
+                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                           If not, then use the in-text-only personal communication format -->
+                      <date variable="issued" form="text"/>
+                    </if>
+                    <else>
+                      <date variable="issued">
+                        <date-part name="year"/>
+                      </date>
+                    </else>
+                  </choose>
+                </if>
+                <else>
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                </else>
+              </choose>
+              <text variable="year-suffix"/>
+            </group>
+          </group>
         </group>
       </if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
+      <else-if variable="status">
+        <text variable="status" text-case="lowercase"/>
+        <text variable="year-suffix" prefix="-"/>
       </else-if>
-      <else-if variable="title">
+      <else>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- APA has two description elements following the title:
+       title (parenthetical) [bracketed]  -->
+  <macro name="title-and-descriptions">
+    <choose>
+      <if variable="title">
+        <group delimiter=" ">
+          <text macro="title"/>
+          <text macro="parenthetical"/>
+          <text macro="bracketed"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <text macro="bracketed"/>
+          <text macro="parenthetical"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="post webpage" match="any">
+        <!-- Webpages are always italicized -->
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else-if variable="container-title" match="any">
+        <!-- Other types are italicized based on presence of container-title.
+             Assume that review and review-book are published in periodicals/blogs,
+             not just on a web page (ex. 69) -->
+        <text variable="title"/>
+      </else-if>
+      <else>
         <choose>
-          <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a software type -->
-            <text variable="title"/>
+          <if type="article-journal article-magazine article-newspaper post-weblog review review-book">
+            <text variable="title" font-style="italic"/>
           </if>
-          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <else-if type="paper-conference">
             <choose>
-              <if variable="reviewed-title">
-                <choose>
-                  <if type="post post-weblog webpage" variable="container-title" match="any">
-                    <text variable="title"/>
-                  </if>
-                  <else>
-                    <text variable="title" font-style="italic"/>
-                  </else>
-                </choose>
+              <if variable="collection-editor editor editorial-director" match="any">
+                <group delimiter=": " font-style="italic">
+                  <text variable="title"/>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <label variable="volume" form="short" text-case="capitalize-first"/>
+                        <text variable="volume"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
               </if>
+              <else>
+                <text variable="title" font-style="italic"/>
+              </else>
             </choose>
           </else-if>
-          <else-if type="post post-weblog webpage" variable="container-title" match="any">
-            <text variable="title"/>
+          <else>
+            <group delimiter=": " font-style="italic">
+              <text variable="title"/>
+              <!-- Replace with volume-title as that becomes available -->
+              <choose>
+                <if is-numeric="volume" match="none">
+                  <group delimiter=" ">
+                    <label variable="volume" form="short" text-case="capitalize-first"/>
+                    <text variable="volume"/>
+                  </group>
+                </if>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-intext">
+    <choose>
+      <if variable="title" match="none">
+        <text macro="bracketed-intext" prefix="[" suffix="]"/>
+      </if>
+      <else-if type="bill">
+        <!-- If a bill has no number or container-title, assume it is a hearing; italic and title case -->
+        <choose>
+          <if variable="number container-title" match="none">
+            <text variable="title" form="short" font-style="italic" text-case="title"/>
+          </if>
+          <else-if variable="title">
+            <text variable="title" form="short"/>
           </else-if>
           <else>
-            <text variable="title" font-style="italic"/>
+            <group delimiter=" ">
+              <text variable="genre"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="chapter-number container-title" match="none">
+                    <!-- Replace with label variable="number" as that becomes available -->
+                    <text term="issue" form="short"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </group>
           </else>
         </choose>
       </else-if>
-      <else-if variable="interviewer" type="interview" match="any">
-        <names variable="interviewer">
-          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
-          <name and="symbol" initialize-with=". " delimiter=", "/>
-        </names>
+      <else-if type="legal_case" match="any">
+        <!-- Cases are italicized -->
+        <text variable="title" font-style="italic"/>
       </else-if>
+      <else-if type="legislation treaty" match="any">
+        <!-- Legislation and treaties not italicized or quoted -->
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="post webpage" match="any">
+        <!-- Webpages are always italicized -->
+        <text variable="title" form="short" font-style="italic"/>
+      </else-if>
+      <else-if variable="container-title" match="any">
+        <!-- Other types are italicized or quoted based on presence of container-title. As in title macro. -->
+        <text variable="title" form="short" quotes="true"/>
+      </else-if>
+      <else>
+        <text variable="title" form="short" font-style="italic"/>
+      </else>
     </choose>
   </macro>
-  <!-- APA has four descriptive sections following the title: -->
-  <!-- (description), [format], container, event -->
-  <macro name="description">
+  <macro name="parenthetical">
+    <!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->
     <group prefix="(" suffix=")">
       <choose>
-        <!-- book is here to catch software with container titles -->
-        <if type="book report" match="any">
+        <if type="patent">
+          <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
+          <group delimiter=" ">
+            <text variable="authority" form="short"/>
+            <choose>
+              <if variable="genre">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <text value="patent" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <group delimiter=" ">
+              <!-- Replace with label variable="number" if that becomes available -->
+              <text term="issue" form="short" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </group>
+        </if>
+        <else-if type="post webpage">
+          <!-- For post webpage, container-title is treated as publisher -->
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <text macro="database-location"/>
+            <text macro="number"/>
+            <text macro="locators-booklike"/>
+          </group>
+        </else-if>
+        <else-if variable="container-title">
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <choose>
+              <if type="broadcast graphic map motion_picture song" match="any">
+                <!-- For audiovisual media, number information comes after title, not container-title -->
+                <text macro="number"/>
+              </if>
+            </choose>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <text macro="database-location"/>
+            <text macro="number"/>
+            <text macro="locators-booklike"/>
+          </group>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="parenthetical-container">
+    <choose>
+      <if variable="container-title" match="any">
+        <group prefix="(" suffix=")">
+          <group delimiter="; ">
+            <text macro="database-location"/>
+            <choose>
+              <if type="broadcast graphic map motion_picture song" match="none">
+                <!-- For audiovisual media, number information comes after title, not container-title -->
+                <text macro="number"/>
+              </if>
+            </choose>
+            <text macro="locators-booklike"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="bracketed">
+    <!-- [Descriptive information] -->
+    <!-- If there is a number, genre is already printed in macro="number" -->
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <!-- Reviewed item -->
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <!-- Assume that genre is entered as 'Review of the book' or similar -->
+                <choose>
+                  <if variable="number" match="none">
+                    <choose>
+                      <if variable="genre">
+                        <text variable="genre" text-case="capitalize-first"/>
+                      </if>
+                      <else-if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </else-if>
+                      <else>
+                        <!-- Replace with term="review" as that becomes available -->
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </if>
+                  <else>
+                    <choose>
+                      <if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                      <else>
+                        <!-- Replace with term="review" as that becomes available -->
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </else>
+                </choose>
+                <text macro="reviewed-title"/>
+              </group>
+              <names variable="reviewed-author">
+                <label form="verb-short" suffix=" "/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+            </group>
+            <choose>
+              <if variable="genre" match="any">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </group>
+        </if>
+        <else-if type="thesis">
+          <!-- Thesis type and institution -->
+          <group delimiter="; ">
+            <choose>
+              <if variable="number" match="none">
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="archive DOI URL" match="any">
+                      <!-- Include the university in brackets if thesis is published -->
+                      <text variable="publisher"/>
+                    </if>
+                  </choose>
+                </group>
+              </if>
+            </choose>
+            <text variable="medium" text-case="capitalize-first"/>
+          </group>
+        </else-if>
+        <else-if variable="interviewer" type="interview" match="any">
+          <!-- Interview information -->
           <choose>
-            <if variable="container-title">
-              <text macro="secondary-contributors"/>
+            <if variable="title">
+              <text macro="format"/>
             </if>
+            <else-if variable="genre">
+              <group delimiter="; ">
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <group delimiter=" ">
+                    <text term="author" form="verb"/>
+                    <names variable="interviewer">
+                      <name and="symbol" initialize-with=". " delimiter=", "/>
+                    </names>
+                  </group>
+                </group>
+              </group>
+            </else-if>
+            <else-if variable="interviewer">
+              <group delimiter="; ">
+                <names variable="interviewer">
+                  <label form="verb" suffix=" " text-case="capitalize-first"/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                </names>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </else-if>
             <else>
+              <text macro="format"/>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="personal_communication">
+          <!-- Letter information -->
+          <choose>
+            <if variable="recipient">
               <group delimiter="; ">
-                <text macro="description-report"/>
-                <text macro="secondary-contributors"/>
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="number" match="none">
+                      <choose>
+                        <if variable="genre">
+                          <text variable="genre" text-case="capitalize-first"/>
+                        </if>
+                        <else-if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </else-if>
+                        <else>
+                          <text term="letter" form="short" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </if>
+                    <else>
+                      <choose>
+                        <if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </if>
+                        <else>
+                          <text term="letter" form="short" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </else>
+                  </choose>
+                  <names variable="recipient" delimiter=", ">
+                    <label form="verb" suffix=" "/>
+                    <name and="symbol" delimiter=", "/>
+                  </names>
+                </group>
+                <choose>
+                  <if variable="genre" match="any">
+                    <choose>
+                      <if variable="number" match="none">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                    </choose>
+                  </if>
+                </choose>
               </group>
+            </if>
+            <else>
+              <text macro="format"/>
             </else>
           </choose>
-        </if>
-        <else-if type="thesis">
-          <group delimiter="; ">
-            <group delimiter=", ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <choose>
-                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
-                <if variable="DOI URL archive" match="any">
-                  <text variable="publisher"/>
-                </if>
-              </choose>
-            </group>
-            <text macro="locators"/>
-            <text macro="secondary-contributors"/>
-          </group>
         </else-if>
-        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+        <else-if variable="composer" type="song" match="all">
+          <!-- Performer of classical music works -->
           <group delimiter="; ">
-            <text macro="locators"/>
-            <text macro="secondary-contributors"/>
+            <choose>
+              <if variable="number" match="none">
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="genre">
+                      <text variable="genre" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </if>
+                    <else-if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else-if>
+                    <else>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </if>
+                    <else>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <choose>
+              <if variable="genre" match="any">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
           </group>
         </else-if>
-        <else-if type="song">
+        <else-if variable="container-title" match="none">
+          <!-- Other description -->
+          <text macro="format"/>
+        </else-if>
+        <else>
+          <!-- For conference presentations, chapters in reports, software, place bracketed after the container title -->
           <choose>
-            <if variable="container-title" match="none">
-              <text macro="locators"/>
+            <if type="paper-conference speech" match="any">
+              <choose>
+                <if variable="collection-editor editor editorial-director issue page volume" match="any">
+                  <text macro="format"/>
+                </if>
+              </choose>
             </if>
+            <else-if type="book">
+              <choose>
+                <if variable="version" match="none">
+                  <text macro="format"/>
+                </if>
+              </choose>
+            </else-if>
+            <else-if type="report" match="none">
+              <text macro="format"/>
+            </else-if>
           </choose>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="bracketed-intext">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <!-- This should be localized -->
+          <text macro="reviewed-title-intext" prefix="Review of "/>
+        </if>
+        <else-if variable="interviewer" type="interview" match="any">
+          <names variable="interviewer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <substitute>
+              <text macro="format-intext"/>
+            </substitute>
+          </names>
         </else-if>
-        <else-if type="article dataset figure" match="any">
+        <else-if type="personal_communication">
+          <!-- Letter information -->
           <choose>
-            <if variable="container-title">
-              <text macro="secondary-contributors"/>
+            <if variable="recipient">
+              <group delimiter=" ">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="genre" text-case="capitalize-first"/>
+                  </if>
+                  <else>
+                    <text term="letter" form="short" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <names variable="recipient" delimiter=", ">
+                  <label form="verb" suffix=" "/>
+                  <name and="symbol" delimiter=", "/>
+                </names>
+              </group>
             </if>
             <else>
-              <group delimiter="; ">
-                <text macro="locators"/>
-                <text macro="secondary-contributors"/>
-              </group>
+              <text macro="format-intext"/>
             </else>
           </choose>
         </else-if>
-        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
-          <text macro="secondary-contributors"/>
-        </else-if>
+        <else>
+          <text macro="format-intext"/>
+        </else>
       </choose>
     </group>
   </macro>
-  <macro name="format">
+  <macro name="bracketed-container">
     <group prefix="[" suffix="]">
       <choose>
-        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <group delimiter=", ">
-            <choose>
-              <if variable="genre">
-                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
-                <group delimiter=", ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <choose>
-                    <if variable="reviewed-title">
-                      <text variable="reviewed-title" font-style="italic"/>
-                    </if>
-                    <else>
-                      <!-- Assume `title` is title of reviewed work -->
-                      <text variable="title" font-style="italic"/>
-                    </else>
-                  </choose>
-                </group>
-              </if>
-              <else>
-                <!-- This should be localized -->
-                <group delimiter=" ">
-                  <text value="Review of"/>
-                  <choose>
-                    <if variable="reviewed-title">
-                      <text variable="reviewed-title" font-style="italic"/>
-                    </if>
-                    <else>
-                      <!-- Assume `title` is title of reviewed work -->
-                      <text variable="title" font-style="italic"/>
-                    </else>
-                  </choose>
-                </group>
-              </else>
-            </choose>
-            <names variable="reviewed-author">
-              <label form="verb-short" suffix=" "/>
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-            </names>
-          </group>
+        <if type="paper-conference speech" match="any">
+          <!-- Conference presentations should describe the session [container] in bracketed unless published in a proceedings -->
+          <choose>
+            <if variable="collection-editor editor editorial-director issue page volume" match="none">
+              <text macro="format"/>
+            </if>
+          </choose>
         </if>
-        <else>
-          <text macro="format-short"/>
-        </else>
+        <else-if type="book" variable="version" match="all">
+          <!-- For entries in mobile app reference works, place bracketed after the container-title -->
+          <text macro="format"/>
+        </else-if>
+        <else-if type="report">
+          <!-- For chapters in reports, place bracketed after the container title -->
+          <text macro="format"/>
+        </else-if>
       </choose>
     </group>
   </macro>
-  <macro name="format-short">
+  <macro name="secondary-contributors">
     <choose>
-      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <text macro="secondary-contributors-periodical"/>
+      </if>
+      <else-if type="paper-conference">
         <choose>
-          <if variable="reviewed-title" match="none">
-            <choose>
-              <if variable="genre">
-                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
-                <group delimiter=", ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text variable="title" form="short" font-style="italic"/>
-                </group>
-              </if>
-              <else>
-                <!-- This should be localized -->
-                <group delimiter=" ">
-                  <text value="Review of"/>
-                  <text variable="title" form="short" font-style="italic"/>
-                </group>
-              </else>
-            </choose>
+          <if variable="collection-editor editor editorial-director" match="any">
+            <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
-            <text variable="title" form="short" quotes="true"/>
+            <text macro="secondary-contributors-periodical"/>
           </else>
         </choose>
-      </if>
-      <else-if type="speech thesis" match="any">
-        <text variable="medium" text-case="capitalize-first"/>
-      </else-if>
-      <!-- book is here to catch software with container titles -->
-      <else-if type="book report" match="any">
-        <choose>
-          <if variable="container-title" match="none">
-            <text macro="format-report"/>
-          </if>
-        </choose>
-      </else-if>
-      <else-if type="manuscript pamphlet" match="any">
-        <text variable="medium" text-case="capitalize-first"/>
       </else-if>
-      <else-if type="personal_communication">
-        <text macro="secondary-contributors"/>
-      </else-if>
-      <else-if type="song">
-        <group delimiter="; ">
-          <text macro="secondary-contributors"/>
+      <else>
+        <text macro="secondary-contributors-booklike"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-periodical">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <names variable="translator" delimiter="; ">
+        <name and="symbol" initialize-with=". " delimiter=", "/>
+        <label form="short" prefix=", " text-case="title"/>
+      </names>
+    </group>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <!-- When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
+      <choose>
+        <if type="post webpage" match="none">
+          <!-- Webpages treat container-title like publisher -->
           <choose>
             <if variable="container-title" match="none">
-              <group delimiter=", ">
-                <text variable="genre" text-case="capitalize-first"/>
-                <text variable="medium" text-case="capitalize-first"/>
+              <group delimiter="; ">
+                <names variable="container-author">
+                  <label form="verb-short" suffix=" " text-case="title"/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                </names>
+                <names variable="editor translator" delimiter="; ">
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                  <label form="short" prefix=", " text-case="title"/>
+                </names>
               </group>
             </if>
           </choose>
-        </group>
-      </else-if>
-      <else-if type="paper-conference">
-        <group delimiter=", ">
-          <choose>
-            <if variable="collection-editor editor issue page volume" match="any">
-              <text variable="genre" text-case="capitalize-first"/>
-            </if>
-          </choose>
-          <text variable="medium" text-case="capitalize-first"/>
-        </group>
-      </else-if>
-      <else-if type="bill legislation legal_case patent treaty" match="none">
-        <choose>
-          <if variable="genre medium" match="any">
-            <group delimiter=", ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <text variable="medium" text-case="capitalize-first"/>
-            </group>
-          </if>
-          <else-if type="dataset">
-            <!-- This should be localized -->
-            <text value="Data set"/>
-          </else-if>
-        </choose>
-      </else-if>
-    </choose>
+        </if>
+        <else>
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </else>
+      </choose>
+    </group>
   </macro>
-  <macro name="description-report">
+  <macro name="database-location">
     <choose>
-      <if variable="number">
-        <group delimiter="; ">
-          <group delimiter=" ">
-            <text variable="genre" text-case="title"/>
-            <!-- Replace with term="number" if that becomes available -->
-            <text term="issue" form="short" text-case="capitalize-first"/>
-            <text variable="number"/>
-          </group>
-          <text macro="locators"/>
-        </group>
+      <if variable="archive-place" match="none">
+        <!-- With `archive-place`: physical archives. Without: online archives. -->
+        <!-- Add archive_collection as that becomes available -->
+        <text variable="archive_location"/>
       </if>
-      <else>
-        <text macro="locators"/>
-      </else>
     </choose>
   </macro>
-  <macro name="format-report">
+  <macro name="number">
     <choose>
       <if variable="number">
-        <text variable="medium" text-case="capitalize-first"/>
-      </if>
-      <else>
         <group delimiter=", ">
-          <text variable="genre" text-case="capitalize-first"/>
-          <text variable="medium" text-case="capitalize-first"/>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="archive">
-    <group delimiter=". ">
-      <group delimiter=", ">
-        <choose>
-          <if type="manuscript">
-            <text variable="genre"/>
-          </if>
-        </choose>
-        <group delimiter=" ">
-          <!-- Replace "archive" with "archive_collection" as that becomes available -->
-          <text variable="archive"/>
-          <text variable="archive_location" prefix="(" suffix=")"/>
-        </group>
-      </group>
-      <group delimiter=", ">
-        <!-- Move "archive" here when "archive_collection" becomes available -->
-        <text variable="archive-place"/>
-      </group>
-    </group>
-  </macro>
-  <macro name="publisher">
-    <choose>
-      <if type="manuscript pamphlet" match="any">
-        <choose>
-          <if variable="archive archive_location archive-place" match="any">
-            <group delimiter=". ">
-              <group delimiter=": ">
-                <text variable="publisher-place"/>
-                <text variable="publisher"/>
-              </group>
-              <text macro="archive"/>
-            </group>
-          </if>
-          <else>
-            <group delimiter=", ">
-              <text variable="genre"/>
-              <text variable="publisher"/>
-              <text variable="publisher-place"/>
-            </group>
-          </else>
-        </choose>
-      </if>
-      <else-if type="thesis" match="any">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="publisher"/>
-            <text variable="publisher-place"/>
-          </group>
-          <text macro="archive"/>
-        </group>
-      </else-if>
-      <else-if type="patent">
-        <group delimiter=". ">
-          <group delimiter=": ">
-            <text variable="publisher-place"/>
-            <text variable="publisher"/>
+          <group delimiter=" ">
+            <text variable="genre" text-case="title"/>
+            <choose>
+              <if is-numeric="number">
+                <!-- Replace with label variable="number" if that becomes available -->
+                <text term="issue" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </if>
+              <else>
+                <text variable="number"/>
+              </else>
+            </choose>
           </group>
-          <text macro="archive"/>
-        </group>
-      </else-if>
-      <else-if type="article-journal article-magazine article-newspaper" match="any">
-        <text macro="archive"/>
-      </else-if>
-      <else-if type="post post-weblog webpage" match="none">
-        <group delimiter=". ">
           <choose>
-            <if variable="event">
+            <if type="thesis">
               <choose>
-                <!-- Only print publisher info if published in a proceedings -->
-                <if variable="collection-editor editor issue page volume" match="any">
-                  <group delimiter=": ">
-                    <text variable="publisher-place"/>
-                    <text variable="publisher"/>
-                  </group>
+                <!-- Include the university in brackets if thesis is published -->
+                <if variable="archive DOI URL" match="any">
+                  <text variable="publisher"/>
                 </if>
               </choose>
             </if>
-            <else>
-              <group delimiter=": ">
-                <text variable="publisher-place"/>
-                <text variable="publisher"/>
-              </group>
-            </else>
           </choose>
-          <text macro="archive"/>
         </group>
-      </else-if>
+      </if>
     </choose>
   </macro>
-  <macro name="event">
+  <macro name="locators-booklike">
     <choose>
-      <if variable="event" type="speech paper-conference" match="any">
+      <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>
+      <else-if type="paper-conference">
         <choose>
-          <!-- Don't print event info if published in a proceedings -->
-          <if variable="collection-editor editor issue page volume" match="none">
-            <group delimiter=" ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <group delimiter=" ">
-                <choose>
-                  <if variable="genre">
-                    <text term="presented at"/>
-                  </if>
-                  <else>
-                    <text term="presented at" text-case="capitalize-first"/>
-                  </else>
-                </choose>
-                <group delimiter=", ">
-                  <text variable="event"/>
-                  <text variable="event-place"/>
-                </group>
-              </group>
+          <if variable="collection-editor editor editorial-director" match="any">
+            <group delimiter=", ">
+              <text macro="version"/>
+              <text macro="edition"/>
+              <text macro="volume-booklike"/>
             </group>
           </if>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="issued">
-    <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if variable="issued">
-        <group>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
-          <text variable="year-suffix"/>
-          <choose>
-            <if type="speech">
-              <date variable="issued" delimiter=" ">
-                <date-part prefix=", " name="month"/>
-              </date>
-            </if>
-            <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
-              <date variable="issued">
-                <date-part prefix=", " name="month"/>
-                <date-part prefix=" " name="day"/>
-              </date>
-            </else-if>
-            <else-if type="paper-conference">
-              <choose>
-                <if variable="container-title" match="none">
-                  <date variable="issued">
-                    <date-part prefix=", " name="month"/>
-                    <date-part prefix=" " name="day"/>
-                  </date>
-                </if>
-              </choose>
-            </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
-          </choose>
-        </group>
-      </else-if>
-      <else-if variable="status">
-        <group>
-          <text variable="status" text-case="lowercase"/>
-          <text variable="year-suffix" prefix="-"/>
-        </group>
+        </choose>
       </else-if>
       <else>
-        <group>
-          <text term="no date" form="short"/>
-          <text variable="year-suffix" prefix="-"/>
+        <group delimiter=", ">
+          <text macro="version"/>
+          <text macro="edition"/>
+          <text macro="volume-booklike"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="version">
+    <choose>
+      <if is-numeric="version">
+        <group delimiter=" ">
+          <!-- replace with label variable="version" if that becomes available -->
+          <text term="version" text-case="capitalize-first"/>
+          <text variable="version"/>
         </group>
+      </if>
+      <else>
+        <text variable="version"/>
       </else>
     </choose>
   </macro>
-  <macro name="issued-sort">
+  <macro name="edition">
     <choose>
-      <if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
-        <date variable="issued">
-          <date-part name="year"/>
-          <date-part name="month"/>
-          <date-part name="day"/>
-        </date>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <label variable="edition" form="short"/>
+        </group>
       </if>
       <else>
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
-  <macro name="issued-year">
-    <group>
+  <macro name="volume-booklike">
+    <group delimiter=", ">
+      <!-- Report series [ex. 52] -->
+      <choose>
+        <if type="report">
+          <group delimiter=" ">
+            <text variable="collection-title" text-case="title"/>
+            <text variable="collection-number"/>
+          </group>
+        </if>
+      </choose>
       <choose>
-        <if type="personal_communication">
+        <if variable="volume" match="any">
           <choose>
-            <if variable="archive DOI publisher URL" match="none">
-              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
-              <date variable="issued" form="text"/>
-            </if>
+            <!-- Non-numeric volumes are already printed as part of the book title -->
+            <if is-numeric="volume" match="none"/>
             <else>
-              <date variable="issued">
-                <date-part name="year"/>
-              </date>
+              <group delimiter=" ">
+                <label variable="volume" form="short" text-case="capitalize-first"/>
+                <number variable="volume" form="numeric"/>
+              </group>
             </else>
           </choose>
         </if>
         <else>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <group>
+            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <text term="page-range-delimiter" prefix="1"/>
+            <number variable="number-of-volumes" form="numeric"/>
+          </group>
         </else>
       </choose>
-      <text variable="year-suffix"/>
+      <group delimiter=" ">
+        <label variable="issue" text-case="capitalize-first"/>
+        <text variable="issue"/>
+      </group>
+      <group delimiter=" ">
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
     </group>
   </macro>
-  <macro name="issued-citation">
+  <macro name="reviewed-title">
     <choose>
-      <if variable="issued">
-        <group delimiter="/">
-          <choose>
-            <if is-uncertain-date="original-date">
-              <group prefix="[" suffix="]" delimiter=" ">
-                <text term="circa" form="short"/>
-                <date variable="original-date">
-                  <date-part name="year"/>
-                </date>
-              </group>
-            </if>
-            <else>
-              <date variable="original-date">
-                <date-part name="year"/>
-              </date>
-            </else>
-          </choose>
-          <choose>
-            <if is-uncertain-date="issued">
-              <group prefix="[" suffix="]" delimiter=" ">
-                <text term="circa" form="short"/>
-                <text macro="issued-year"/>
-              </group>
-            </if>
-            <else>
-              <text macro="issued-year"/>
-            </else>
-          </choose>
-        </group>
+      <if variable="reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed 
+              works [Ex. 69] -->
+        <text variable="reviewed-title" font-style="italic"/>
       </if>
-      <else-if variable="status">
-        <text variable="status" text-case="lowercase"/>
-        <text variable="year-suffix" prefix="-"/>
-      </else-if>
       <else>
-        <text term="no date" form="short"/>
-        <text variable="year-suffix" prefix="-"/>
+        <!-- Assume title is title of reviewed work -->
+        <text variable="title" font-style="italic"/>
       </else>
     </choose>
   </macro>
-  <macro name="original-date">
+  <macro name="reviewed-title-intext">
     <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech">
-        <date variable="original-date" delimiter=" ">
-          <date-part name="month"/>
-          <date-part name="year"/>
-        </date>
-      </else-if>
-      <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
-        <date variable="original-date" form="text"/>
-      </else-if>
+      <if variable="reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed works [Ex. 69] -->
+        <text variable="reviewed-title" form="short" font-style="italic"/>
+      </if>
       <else>
-        <date variable="original-date">
-          <date-part name="year"/>
-        </date>
+        <!-- Assume title is title of reviewed work -->
+        <text variable="title" form="short" font-style="italic"/>
       </else>
     </choose>
   </macro>
-  <macro name="original-published">
-    <!--This should be localized -->
+  <macro name="format">
     <choose>
-      <if type="bill legal_case legislation" match="any"/>
-      <else-if type="interview motion_picture song" match="any">
-        <text value="Original work recorded"/>
+      <if variable="genre medium" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="number" match="none">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </if>
+      <!-- Generic labels for specific types -->
+      <!-- These should be localized when possible -->
+      <else-if type="dataset">
+        <text value="Data set"/>
       </else-if>
-      <else-if type="broadcast">
-        <text value="Original work broadcast"/>
+      <else-if type="book" variable="version" match="all">
+        <!-- Replace with type="software" and term="software" as that becomes available -->
+        <text value="Computer software"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="letter" text-case="capitalize-first"/>
+          </if>
+          <else-if type="interview">
+            <text term="interview" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="map">
+        <text value="Map"/>
       </else-if>
-      <else>
-        <text value="Original work published"/>
-      </else>
     </choose>
   </macro>
-  <macro name="edition">
+  <macro name="format-intext">
     <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short"/>
-        </group>
+      <if variable="genre" match="any">
+        <text variable="genre" text-case="capitalize-first"/>
       </if>
-      <else>
-        <text variable="edition"/>
-      </else>
+      <else-if variable="medium">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <!-- Generic labels for specific types -->
+      <!-- These should be localized when possible -->
+      <else-if type="dataset">
+        <text value="Data set"/>
+      </else-if>
+      <else-if type="book" variable="version" match="all">
+        <!-- Replace with type="software" and term="software" as that becomes available -->
+        <text value="Computer software"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="letter" text-case="capitalize-first"/>
+          </if>
+          <else-if type="interview">
+            <text term="interview" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="map">
+        <text value="Map"/>
+      </else-if>
     </choose>
   </macro>
-  <macro name="locators">
+  <!-- APA 'source' element contains four parts:
+       container, event, publisher, access -->
+  <macro name="container">
     <choose>
-      <if type="article-journal article-magazine figure review review-book" match="any">
-        <group delimiter=", ">
-          <group>
-            <text variable="volume" font-style="italic"/>
-            <text variable="issue" prefix="(" suffix=")"/>
-          </group>
-          <text variable="page"/>
-        </group>
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <!-- Periodical items -->
+        <text macro="container-periodical"/>
       </if>
-      <else-if type="article-newspaper">
-        <group delimiter=" ">
-          <label variable="page" form="short"/>
-          <text variable="page"/>
-        </group>
-      </else-if>
       <else-if type="paper-conference">
+        <!-- Determine if paper-conference is a periodical or booklike -->
         <choose>
-          <if variable="collection-editor editor" match="any">
-            <text macro="locators-booklike"/>
+          <if variable="editor editorial-director collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
           </if>
           <else>
-            <group delimiter=", ">
-              <group>
-                <text variable="volume" font-style="italic"/>
-                <text variable="issue" prefix="(" suffix=")"/>
-              </group>
-              <text variable="page"/>
-            </group>
+            <text macro="container-periodical"/>
           </else>
         </choose>
       </else-if>
-      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
-        <text macro="locators-booklike"/>
+      <else-if type="post webpage" match="none">
+        <!-- post and webpage treat container-title like publisher -->
+        <text macro="container-booklike"/>
       </else-if>
     </choose>
   </macro>
-  <macro name="locators-booklike">
-    <group delimiter=", ">
-      <text macro="edition"/>
-      <group delimiter=" ">
-        <text term="version" text-case="capitalize-first"/>
-        <text variable="version"/>
+  <macro name="container-periodical">
+    <group delimiter=". ">
+      <group delimiter=", ">
+        <text variable="container-title" font-style="italic" text-case="title"/>
+        <choose>
+          <if variable="volume">
+            <group>
+              <text variable="volume" font-style="italic"/>
+              <text variable="issue" prefix="(" suffix=")"/>
+            </group>
+          </if>
+          <else>
+            <text variable="issue" font-style="italic"/>
+          </else>
+        </choose>
+        <choose>
+          <if variable="page">
+            <text variable="page"/>
+          </if>
+          <else>
+            <!-- Ex. 6: Journal article with article number or eLocator -->
+            <!-- This should be localized -->
+            <text variable="number" prefix="Article "/>
+          </else>
+        </choose>
       </group>
       <choose>
-        <if variable="volume" match="any">
+        <if variable="issued">
           <choose>
-            <if is-numeric="volume" match="none"/>
-            <else-if variable="collection-title">
-              <choose>
-                <if variable="editor translator" match="none">
-                  <choose>
-                    <if variable="collection-number">
-                      <group>
-                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                        <number variable="volume" form="numeric"/>
-                      </group>
-                    </if>
-                  </choose>
-                </if>
-              </choose>
-            </else-if>
-            <else>
-              <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
-              </group>
-            </else>
+            <if variable="issue page volume" match="none">
+              <text variable="status" text-case="capitalize-first"/>
+            </if>
           </choose>
         </if>
-        <else>
-          <group>
-            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
-          </group>
-        </else>
-      </choose>
-      <group>
-        <label variable="page" form="short" suffix=" "/>
-        <text variable="page"/>
-      </group>
-    </group>
-  </macro>
-  <macro name="citation-locator">
-    <group>
-      <choose>
-        <if locator="chapter">
-          <label variable="locator" text-case="capitalize-first"/>
-        </if>
-        <else>
-          <label variable="locator" form="short"/>
-        </else>
       </choose>
-      <text variable="locator" prefix=" "/>
     </group>
   </macro>
-  <macro name="container">
+  <macro name="container-booklike">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
-        <group delimiter=", ">
-          <text macro="container-title"/>
-          <text macro="locators"/>
-        </group>
-        <choose>
-          <!--for advance online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
-      </if>
-      <else-if type="article dataset figure" match="any">
-        <choose>
-          <if variable="container-title">
-            <group delimiter=", ">
-              <text macro="container-title"/>
-              <text macro="locators"/>
-            </group>
-            <choose>
-              <!--for advance online publication-->
-              <if variable="issued">
-                <choose>
-                  <if variable="page issue" match="none">
-                    <text variable="status" text-case="capitalize-first" prefix=". "/>
-                  </if>
-                </choose>
-              </if>
-            </choose>
-          </if>
-        </choose>
-      </else-if>
-      <!-- book is here to catch software with container titles -->
-      <else-if type="book" variable="container-title" match="all">
+      <if variable="container-title" match="any">
         <group delimiter=" ">
-          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <text term="in" text-case="capitalize-first"/>
           <group delimiter=", ">
-            <text macro="container-contributors"/>
-            <group delimiter=" ">
-              <text macro="container-title"/>
-              <text macro="description-report" prefix="(" suffix=")"/>
-              <text macro="format-report" prefix="[" suffix="]"/>
+            <names variable="editor translator" delimiter=", &amp; ">
+              <!-- Change to editortranslator and move editor to substitute as that becomes available -->
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" text-case="title" prefix=" (" suffix=")"/>
+              <substitute>
+                <names variable="editorial-director"/>
+                <names variable="collection-editor"/>
+                <names variable="container-author"/>
+              </substitute>
+            </names>
+            <group delimiter=": " font-style="italic">
+              <text variable="container-title"/>
+              <!-- Replace with volume-title as that becomes available -->
+              <choose>
+                <if is-numeric="volume" match="none">
+                  <group delimiter=" ">
+                    <label variable="volume" form="short" text-case="capitalize-first"/>
+                    <text variable="volume"/>
+                  </group>
+                </if>
+              </choose>
             </group>
           </group>
+          <text macro="parenthetical-container"/>
+          <text macro="bracketed-container"/>
         </group>
-      </else-if>
-      <else-if type="report" variable="container-title" match="all">
-        <group delimiter=" ">
-          <text term="in" text-case="capitalize-first" suffix=" "/>
-          <group delimiter=", ">
-            <text macro="container-contributors"/>
-            <group delimiter=" ">
-              <text macro="container-title"/>
-              <text macro="description-report" prefix="(" suffix=")"/>
-              <text macro="format-report" prefix="[" suffix="]"/>
-            </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <choose>
+        <if type="thesis">
+          <choose>
+            <if variable="archive DOI URL" match="none">
+              <text variable="publisher"/>
+            </if>
+          </choose>
+        </if>
+        <else-if type="post webpage">
+          <!-- For websites, treat container title like publisher -->
+          <group delimiter="; ">
+            <text variable="container-title" text-case="title"/>
+            <text variable="publisher"/>
           </group>
-        </group>
-      </else-if>
-      <else-if type="song" variable="container-title" match="all">
+        </else-if>
+        <else-if type="paper-conference">
+          <!-- For paper-conference, don't print publisher if in a journal-like proceedings -->
+          <choose>
+            <if variable="collection-editor editor editorial-director" match="any">
+              <text variable="publisher"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article-journal article-magazine article-newspaper post-weblog" match="none">
+          <text variable="publisher"/>
+        </else-if>
+      </choose>
+      <group delimiter=", ">
+        <choose>
+          <if variable="archive-place">
+            <!-- With `archive-place`: physical archives. Without: online archives. -->
+            <!-- For physical archives, print the location before the archive name.
+                For electronic archives, these are printed in macro="description". -->
+            <!-- Split "archive_location" into "archive_collection" and "archive_location" as that becomes available -->
+            <!-- Must test for archive_collection:
+                With collection: archive_collection (archive_location), archive, archive-place
+                No collection: archive (archive_location), archive-place
+            -->
+            <text variable="archive_location"/>
+          </if>
+        </choose>
+        <text variable="archive"/>
+        <text variable="archive-place"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else-if variable="URL">
         <group delimiter=" ">
-          <text term="in" text-case="capitalize-first" suffix=" "/>
-          <group delimiter=", ">
-            <text macro="container-contributors"/>
-            <group delimiter=" ">
-              <text macro="container-title"/>
-              <text macro="locators" prefix="(" suffix=")"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="genre" text-case="capitalize-first"/>
-                <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="issued status" match="none">
+              <group delimiter=" ">
+                <text term="retrieved" text-case="capitalize-first"/>
+                <date variable="accessed" form="text" suffix=","/>
+                <text term="from"/>
               </group>
-            </group>
-          </group>
+            </if>
+          </choose>
+          <text variable="URL"/>
         </group>
       </else-if>
-      <else-if type="paper-conference">
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
-          <if variable="editor collection-editor container-author" match="any">
-            <text macro="container-booklike"/>
-          </if>
-          <else>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <!-- Don't print event info if published in a proceedings -->
             <group delimiter=", ">
-              <text macro="container-title"/>
-              <text macro="locators"/>
+              <text variable="event"/>
+              <text variable="event-place"/>
             </group>
-          </else>
-        </choose>
-      </else-if>
-      <else-if type="book">
-        <choose>
-          <!-- book and software should not cite collection-title, only container-title -->
-          <if variable="container-title">
-            <text macro="container-booklike"/>
           </if>
         </choose>
-      </else-if>
-      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
-        <text macro="container-booklike"/>
-      </else-if>
-      <else-if type="bill legal_case legislation treaty" match="any">
-        <text macro="legal-cites"/>
-      </else-if>
+      </if>
     </choose>
   </macro>
-  <macro name="container-booklike">
+  <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
+  <macro name="publication-history">
     <choose>
-      <if variable="container-title collection-title" match="any">
-        <group delimiter=" ">
-          <text term="in" text-case="capitalize-first"/>
+      <if type="patent" match="none">
+        <group prefix="(" suffix=")">
+          <choose>
+            <if variable="references">
+              <!-- This provides the option for more elaborate description 
+                   of publication history, such as full "reprinted" references
+                   (examples 11, 43, 44) or retracted references -->
+              <text variable="references"/>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text value="Original work published"/>
+                <choose>
+                  <if is-uncertain-date="original-date">
+                    <text term="circa" form="short"/>
+                  </if>
+                </choose>
+                <date variable="original-date">
+                  <date-part name="year"/>
+                </date>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else>
+        <text variable="references" prefix="(" suffix=")"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- Legal citations have their own rules -->
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+            </group>
+            <text variable="references"/>
+          </group>
+          <text macro="access"/>
+        </group>
+      </if>
+      <else-if type="bill">
+        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+        <group delimiter=". ">
           <group delimiter=", ">
-            <text macro="container-contributors"/>
             <choose>
-              <if variable="container-author editor translator" match="none">
-                <group delimiter=". ">
-                  <group delimiter=": ">
-                    <text variable="collection-title" font-style="italic" text-case="title"/>
-                    <choose>
-                      <if variable="collection-title">
-                        <group delimiter=" ">
-                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                          <number variable="collection-number" font-style="italic" form="numeric"/>
-                          <choose>
-                            <if variable="collection-number" match="none">
-                              <number variable="volume" font-style="italic" form="numeric"/>
-                            </if>
-                          </choose>
-                        </group>
-                      </if>
-                    </choose>
-                  </group>
-                  <!-- Replace with volume-title as that becomes available -->
-                  <group delimiter=": ">
-                    <text macro="container-title"/>
-                    <choose>
-                      <if variable="collection-title" is-numeric="volume" match="none">
-                        <group delimiter=" ">
-                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                          <text variable="volume" font-style="italic"/>
-                        </group>
-                      </if>
-                    </choose>
-                  </group>
-                </group>
+              <if variable="number container-title" match="none">
+                <!-- If no number or container-title, then assume it is a hearing -->
+                <text variable="title" font-style="italic"/>
               </if>
               <else>
-                <!-- Replace with volume-title as that becomes available -->
-                <group delimiter=": ">
-                  <text macro="container-title"/>
-                  <choose>
-                    <if is-numeric="volume" match="none">
-                      <group delimiter=" ">
-                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                        <text variable="volume" font-style="italic"/>
-                      </group>
-                    </if>
-                  </choose>
-                </group>
+                <text variable="title"/>
               </else>
             </choose>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <choose>
+                <if variable="number container-title" match="none">
+                  <!-- If no number or container-title, then assume it is a hearing -->
+                  <names variable="author" prefix="(testimony of " suffix=")">
+                    <name and="symbol" delimiter=", "/>
+                  </names>
+                </if>
+                <else>
+                  <text variable="status" prefix="(" suffix=")"/>
+                </else>
+              </choose>
+            </group>
+            <text variable="references"/>
           </group>
-          <group delimiter="; " prefix="(" suffix=")">
-            <text macro="locators"/>
-            <names variable="container-author">
-              <label form="verb-short" suffix=" " text-case="title"/>
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-            </names>
+          <text macro="access"/>
+        </group>
+      </else-if>
+      <else-if type="legislation">
+        <!-- Currently designed to handle statutes, codified regulations, executive orders.
+             For uncodified regulations, assume future code section is in status. -->
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <text variable="status" prefix="(" suffix=")"/>
+            </group>
+            <text variable="references"/>
           </group>
+          <text macro="access"/>
         </group>
-      </if>
+      </else-if>
+      <else-if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
+          <text macro="access"/>
+        </group>
+      </else-if>
     </choose>
   </macro>
-  <macro name="container-title">
+  <macro name="date-legal">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper dataset" match="any">
-        <text variable="container-title" font-style="italic" text-case="title"/>
+      <if type="legal_case">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <text variable="authority"/>
+          <choose>
+            <if variable="container-title" match="any">
+              <!-- Print only year for cases published in reporters-->
+              <date variable="issued" form="numeric" date-parts="year"/>
+            </if>
+            <else>
+              <date variable="issued" form="text"/>
+            </else>
+          </choose>
+        </group>
       </if>
-      <else-if type="paper-conference speech">
-        <choose>
-          <if variable="collection-editor container-author editor" match="any">
-            <text variable="container-title" font-style="italic"/>
-          </if>
-          <else>
-            <text variable="container-title" font-style="italic" text-case="title"/>
-          </else>
-        </choose>
+      <else-if type="bill legislation" match="any">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <group delimiter=" ">
+            <date variable="original-date">
+              <date-part name="year"/>
+            </date>
+            <text term="and" form="symbol"/>
+          </group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
       </else-if>
-      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
-        <text variable="container-title" font-style="italic"/>
+      <else-if type="treaty">
+        <date variable="issued" form="text"/>
       </else-if>
     </choose>
   </macro>
-  <macro name="legal-cites">
+  <macro name="container-legal">
+    <!-- Expect legal item container-titles to be stored in short form -->
     <choose>
       <if type="legal_case">
-        <group prefix=", " delimiter=" ">
-          <group delimiter=" ">
-            <choose>
-              <if variable="container-title">
+        <group delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <group delimiter=" ">
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!--change to label variable="section" as that becomes available -->
+                  <!-- Change to label variable="section" as that becomes available -->
                   <text term="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
-                <text variable="page"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <choose>
-                    <if is-numeric="number">
-                      <!-- Replace with term="number" if that becomes available -->
-                      <text term="issue" form="short" text-case="capitalize-first"/>
-                    </if>
-                  </choose>
-                  <text variable="number"/>
-                </group>
-              </else>
-            </choose>
-          </group>
-          <group prefix="(" suffix=")" delimiter=" ">
-            <text variable="authority"/>
-            <choose>
-              <if variable="container-title" match="any">
-                <!--Only print year for cases published in reporters-->
-                <date variable="issued" form="numeric" date-parts="year"/>
-              </if>
-              <else>
-                <date variable="issued" form="text"/>
-              </else>
-            </choose>
-          </group>
+                <choose>
+                  <if variable="page page-first" match="any">
+                    <text variable="page-first"/>
+                  </if>
+                  <else>
+                    <text value="___"/>
+                  </else>
+                </choose>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <choose>
+                  <if is-numeric="number">
+                    <!-- Replace with label variable="number" if that becomes available -->
+                    <text term="issue" form="short" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
-        <group prefix=", " delimiter=" ">
-          <group delimiter=", ">
-            <choose>
-              <if variable="number">
-                <!--There's a public law number-->
-                <text variable="number" prefix="Pub. L. No. "/>
-                <group delimiter=" ">
-                  <!--change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
-                  <text variable="section"/>
-                </group>
-                <group delimiter=" ">
-                  <text variable="volume"/>
-                  <text variable="container-title"/>
-                  <text variable="page-first"/>
-                </group>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="volume"/>
-                  <text variable="container-title"/>
-                  <!--change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
-                  <text variable="section"/>
-                </group>
-              </else>
-            </choose>
+      <else-if type="bill">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <group delimiter=" ">
+              <choose>
+                <if variable="chapter-number container-title" match="none">
+                  <!-- Replace with label variable="number" as that becomes available -->
+                  <text term="issue" form="short"/>
+                </if>
+              </choose>
+              <text variable="number"/>
+            </group>
+          </group>
+          <text variable="authority"/>
+          <text variable="chapter-number"/>
+          <group delimiter=" ">
+            <text variable="volume"/>
+            <text variable="container-title"/>
+            <text variable="page-first"/>
           </group>
-          <date variable="issued" prefix="(" suffix=")">
-            <date-part name="year"/>
-          </date>
         </group>
       </else-if>
+      <else-if type="legislation">
+        <choose>
+          <if variable="number">
+            <!--There's a public law number-->
+            <group delimiter=", ">
+              <text variable="number" prefix="Pub. L. No. "/>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <text variable="page-first"/>
+              </group>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="volume"/>
+              <text variable="container-title"/>
+              <choose>
+                <if variable="section">
+                  <group delimiter=" ">
+                    <!-- Change to label variable="section" as that becomes available -->
+                    <text term="section" form="symbol"/>
+                    <text variable="section"/>
+                  </group>
+                </if>
+                <else>
+                  <text variable="page-first"/>
+                </else>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else-if>
       <else-if type="treaty">
         <group delimiter=" ">
           <number variable="volume"/>
           <text variable="container-title"/>
-          <text variable="page"/>
+          <choose>
+            <if variable="page page-first" match="any">
+              <text variable="page-first"/>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <!-- Replace with label variable="number" if that becomes available -->
+                <text term="issue" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
         </group>
       </else-if>
     </choose>
   </macro>
-  <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
+  <macro name="citation-locator">
+    <group delimiter=" ">
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
     <sort>
-      <key macro="author" names-min="8" names-use-first="6"/>
-      <key macro="issued-sort"/>
+      <key macro="author-bib" names-min="21" names-use-first="19"/>
+      <key macro="date-sort-group"/>
+      <key macro="date-sort-date" sort="ascending"/>
+      <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
-        <text macro="author-short"/>
-        <text macro="issued-citation"/>
+        <text macro="author-intext"/>
+        <text macro="date-intext"/>
         <text macro="citation-locator"/>
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2">
+  <bibliography hanging-indent="true" et-al-min="21" et-al-use-first="19" et-al-use-last="true" entry-spacing="0" line-spacing="2">
     <sort>
-      <key macro="author"/>
-      <key macro="issued-sort" sort="ascending"/>
+      <key macro="author-bib"/>
+      <key macro="date-sort-group"/>
+      <key macro="date-sort-date" sort="ascending"/>
+      <key variable="status"/>
       <key macro="title"/>
     </sort>
     <layout>
-      <group suffix=".">
-        <group delimiter=". ">
-          <text macro="author"/>
+      <choose>
+        <if type="bill legal_case legislation treaty" match="any">
+          <!-- Legal items have different orders and delimiters -->
           <choose>
-            <if is-uncertain-date="issued">
-              <group prefix=" [" suffix="]" delimiter=" ">
-                <text term="circa" form="short"/>
-                <text macro="issued"/>
-              </group>
+            <if variable="DOI URL" match="any">
+              <text macro="legal-cites"/>
             </if>
             <else>
-              <text macro="issued" prefix=" (" suffix=")"/>
+              <text macro="legal-cites" suffix="."/>
             </else>
           </choose>
-          <group delimiter=" ">
-            <text macro="title"/>
-            <choose>
-              <if variable="title interviewer" type="interview" match="any">
-                <group delimiter=" ">
-                  <text macro="description"/>
-                  <text macro="format"/>
-                </group>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text macro="format"/>
-                  <text macro="description"/>
-                </group>
-              </else>
-            </choose>
-          </group>
-          <text macro="container"/>
-        </group>
-        <text macro="event" prefix=". "/>
-      </group>
-      <text macro="access" prefix=" "/>
-      <choose>
-        <if is-uncertain-date="original-date">
-          <group prefix=" [" suffix="]" delimiter=" ">
-            <text macro="original-published"/>
-            <text term="circa" form="short"/>
-            <text macro="original-date"/>
-          </group>
         </if>
-        <else-if variable="original-date">
-          <group prefix=" (" suffix=")" delimiter=" ">
-            <text macro="original-published"/>
-            <text macro="original-date"/>
+        <else>
+          <group delimiter=" ">
+            <group delimiter=". " suffix=".">
+              <text macro="author-bib"/>
+              <text macro="date-bib"/>
+              <text macro="title-and-descriptions"/>
+              <text macro="container"/>
+              <text macro="event"/>
+              <text macro="publisher"/>
+            </group>
+            <text macro="access"/>
+            <text macro="publication-history"/>
           </group>
-        </else-if>
+        </else>
       </choose>
     </layout>
   </bibliography>
-</style>
+</style>
\ No newline at end of file