diff --git a/isometric-park-fna/Content/portraits.yaml b/isometric-park-fna/Content/portraits.yaml
--- a/isometric-park-fna/Content/portraits.yaml
+++ b/isometric-park-fna/Content/portraits.yaml
@@ -3,27 +3,34 @@
   Source: Bain Collection, Via Library of Congress
   URL: https://www.example.com
   Filename: 51105041943_e5527c802e_o.jpg.converted4grey_medium_reorder.jpg
+  Subjects: 1
 - Description: This is a person
   Subject: Person
   Source: Bain Collection, Via Library of Congress
   Filename: 51346251445_ae7044d163_o.jpg.converted4grey_medium_reorder.jpg
+  Subjects: 1
 - Description: This is a person
   Subject: Person
   Source: Bain Collection, Via Library of Congress
   Filename: 51104913627_bf626a8a53_o.jpg.converted4grey_medium_reorder.png
+  Subjects: 1
 - Description: Sun Fo
   Subject: Person
   Source: Bain Collection, Via Library of Congress
   Filename: 9684139377_9f74e12129_o.jpg.converted4grey_medium_reorder.png
+  Subjects: 1
 - Description: M-4 tank crews of the United States, Ft. Knox, Ky.
   Subject: Person
   Source: Bain Collection, Via Library of Congress
   Filename: service-pnp-fsac-1a35000-1a35200-1a35210v.jpg.converted4grey_medium_reorder.png
+  Subjects: 4
 - Description: Yuvaraja of Mysore
   Subject: Person
   Source: Bain Collection, Via Library of Congress
   Filename: service-pnp-ggbain-20000-20016r.jpg.converted4grey_medium_reorder.png
+  Subjects: 1
 - Description: Mrs. Marie L. Baldwin
   Subject: Person
   Source: Bain Collection, Via Library of Congress
   Filename: 5926007035_9d728b1837_o.jpg.converted4grey_medium_reorder.png
+  Subjects: 1
diff --git a/isometric-park-fna/Engines/DialogEngine.cs b/isometric-park-fna/Engines/DialogEngine.cs
--- a/isometric-park-fna/Engines/DialogEngine.cs
+++ b/isometric-park-fna/Engines/DialogEngine.cs
@@ -105,7 +105,7 @@
                             CurrentDialog = dialog,
                             CurrentSpeaker = speaker.Trim(),
                             Options = this.Story.currentChoices
-                            .Select(option => BleepString(option.text, 
+                            .Select(option => BleepString(this.Grammar.Flatten(option.text), 
                                         profanity_setting ))
                             .ToList()});
 
@@ -155,7 +155,8 @@
                                 CurrentDialog = dialog,
                                 CurrentSpeaker = speaker.Trim(),
                                 Options = this.Story.currentChoices
-                                .Select(option => option.text)
+                                .Select(option => BleepString(this.Grammar.Flatten(option.text), 
+                                            profanity_setting ))
                                 .ToList()});
 
                        var index = DialogSpawner.GetSpeakerImageIndex(this.Grammar, this.Random, speaker);
diff --git a/isometric-park-fna/Engines/Spawners/DialogSpawner.cs b/isometric-park-fna/Engines/Spawners/DialogSpawner.cs
--- a/isometric-park-fna/Engines/Spawners/DialogSpawner.cs
+++ b/isometric-park-fna/Engines/Spawners/DialogSpawner.cs
@@ -94,7 +94,7 @@
                     CurrentDialog = this.Grammar.Flatten(dialog),
                     CurrentSpeaker = this.Grammar.Flatten(speaker).Trim(),
                     Options = this.Story.currentChoices
-                    .Select(option => option.text)
+                    .Select(option => this.Grammar.Flatten(option.text))
                     .ToList()});
 
             AddComponent(newDialog, new WindowTypeComponent {
@@ -102,7 +102,7 @@
 			AddComponent(newDialog,
 					new VisibilityComponent{ visible = true});
 
-            index = GetSpeakerImageIndex(this.Grammar, this.Random, speaker);
+            index = GetSpeakerImageIndex(this.Grammar, this.Random, speaker, 1);
 
             AddComponent(newDialog, new ImageComponent {
                     ImageIndex = index});
diff --git a/isometric-park-fna/ImageMap.cs b/isometric-park-fna/ImageMap.cs
--- a/isometric-park-fna/ImageMap.cs
+++ b/isometric-park-fna/ImageMap.cs
@@ -9,14 +9,24 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 
+using isometricparkfna.Spawners;
+
 namespace isometricparkfna
 {
+    // public enum Role {
+    //    Unspecified,
+    //    Assistant,
+    //    Governor
+    // }
+
     public struct ImageMetadata {
         public string Description;
         public string Subject;
         public string Source;
         public string URL;
         public string Filename;
+        public OrganizationType[] OrganizationType;
+        public int Subjects;
     }
 
     public class ImageMap