diff --git a/AuroraRecordGenerator/Record.cs b/AuroraRecordGenerator/Record.cs
index 4b7ac46..08cc3a3 100644
--- a/AuroraRecordGenerator/Record.cs
+++ b/AuroraRecordGenerator/Record.cs
@@ -112,5 +112,11 @@ namespace AuroraRecordGenerator
 
         [ProtoMember(37)]
         public string EmploymentSkills { get; set; } = string.Empty;
+
+        [ProtoMember(38)]
+        public string SecurityAttitudeScc { get; set; } = string.Empty;
+
+        [ProtoMember(39)]
+        public string SecurityAttitudeCrew { get; set; } = string.Empty;
     }
 }
\ No newline at end of file
diff --git a/AuroraRecordGenerator/RecordEditor.xaml b/AuroraRecordGenerator/RecordEditor.xaml
index 53d2a46..fdcf02f 100644
--- a/AuroraRecordGenerator/RecordEditor.xaml
+++ b/AuroraRecordGenerator/RecordEditor.xaml
@@ -17,6 +17,11 @@
                 <x:Type TypeName="local:SpeciesType" />
             </ObjectDataProvider.MethodParameters>
         </ObjectDataProvider>
+        <ObjectDataProvider x:Key="ThreatLevelEnum" MethodName="GetValues" ObjectType="{x:Type system:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="local:ThreatLevel" />
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
     </controls:MetroWindow.Resources>
     <Grid>
         <controls:MetroAnimatedTabControl Margin="10,10,0,45" controls:TabControlHelper.IsUnderlined="True">
@@ -296,11 +301,11 @@
                                  ToolTip="Dated list of operations, surgeries, checkups of note, etc. One per line."
                                  Grid.Row="2" Text="{Binding Path=MedicalHistory}" TabIndex="6" />
                         <TextBox Margin="0,10,0,10" AcceptsReturn="True" TextWrapping="Wrap"
-                                 controls:TextBoxHelper.Watermark="Medical Notes"
+                                 controls:TextBoxHelper.Watermark="Medical Notes - prescriptions, allergies, etc."
                                  controls:TextBoxHelper.UseFloatingWatermark="True"
                                  controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
                                  VerticalScrollBarVisibility="Auto"
-                                 ToolTip="Notes about physical/medical health. One per line." Grid.Row="3"
+                                 ToolTip="Current prescriptions, allergies, etc. One per line." Grid.Row="3"
                                  Text="{Binding Path=MedicalNotes}" TabIndex="7" />
                         <TextBox Margin="0,10,0,10" AcceptsReturn="True"
                                  TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Psychiatric History"
@@ -334,32 +339,52 @@
                             <RowDefinition Height="122" MinHeight="60" />
                             <RowDefinition Height="122" MinHeight="60" />
                             <RowDefinition Height="122" MinHeight="60" />
+                            <RowDefinition Height="122" MinHeight="60" />
                             <RowDefinition Height="0" />
                         </Grid.RowDefinitions>
+                        <Grid Grid.Row="0">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="1*"/>
+                            </Grid.ColumnDefinitions>
+                            <TextBox Grid.Column="0" Margin="0,10,0,10" AcceptsReturn="True"
+                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Attitude Towards the SCC"
+                                 controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
+                                 controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
+                                 ToolTip="A brief summary of the character's perceived attitude towards the conglomerate."
+                                 Text="{Binding Path=SecurityAttitudeScc}" />
+                            <TextBox Grid.Column="1" Margin="0,10,0,10" AcceptsReturn="True"
+                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Attitude Towards the Crew"
+                                 controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
+                                 controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
+                                 ToolTip="A brief summary of the character's perceived attitude towards the rest of the crew."
+                                 Text="{Binding Path=SecurityAttitudeCrew}" />
+                        </Grid>
+
                         <GridSplitter Grid.Row="0" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
                                       VerticalAlignment="Bottom" Margin="0" Height="10" />
                         <GridSplitter Grid.Row="1" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
                                       VerticalAlignment="Bottom" Margin="0" Height="10" />
                         <GridSplitter Grid.Row="2" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
                                       VerticalAlignment="Bottom" Margin="0" Height="10" />
-                        <TextBox Grid.Row="0" Margin="0,10,0,10" AcceptsReturn="True"
+                        <TextBox Grid.Row="1" Margin="0,10,0,10" AcceptsReturn="True"
                                  TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Public Record"
                                  controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
                                  controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
                                  ToolTip="Public security notes added to employment and medical records. One per line."
                                  Text="{Binding Path=SecurityPublicRecord}" />
                         <TextBox Margin="0,10,0,10" AcceptsReturn="True"
-                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Records"
+                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Arrest History"
                                  controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
                                  controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
-                                 ToolTip="List of charges, dated if possible. One per line." Grid.Row="1"
+                                 ToolTip="List of charges, dated if possible. One per line." Grid.Row="2"
                                  Text="{Binding Path=SecurityRecords}" />
                         <TextBox Margin="0,10,0,10" AcceptsReturn="True"
-                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Notes"
+                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Other notes"
                                  controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
                                  controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
                                  ToolTip="Any things security should keep in mind when dealing with you. One per line."
-                                 Grid.Row="2" Text="{Binding Path=SecurityNotes}" />
+                                 Grid.Row="3" Text="{Binding Path=SecurityNotes}" />
                     </Grid>
                 </ScrollViewer>
             </TabItem>
diff --git a/AuroraRecordGenerator/RecordEditor.xaml.cs b/AuroraRecordGenerator/RecordEditor.xaml.cs
index f56f171..2d7f09b 100644
--- a/AuroraRecordGenerator/RecordEditor.xaml.cs
+++ b/AuroraRecordGenerator/RecordEditor.xaml.cs
@@ -46,7 +46,7 @@ namespace AuroraRecordGenerator
 
         private void WindowLoaded(object sender, RoutedEventArgs e)
         {
-            SpeciesCombo.SelectedIndex = 0;
+            SpeciesCombo.SelectedIndex = 1;
         }
 
         private void GenerateRecord(object sender, RoutedEventArgs e)
diff --git a/AuroraRecordGenerator/RecordFormatter.cs b/AuroraRecordGenerator/RecordFormatter.cs
index 6cbb278..cc52ea8 100644
--- a/AuroraRecordGenerator/RecordFormatter.cs
+++ b/AuroraRecordGenerator/RecordFormatter.cs
@@ -25,6 +25,8 @@ namespace AuroraRecordGenerator
         private IList<string> _securityPublicRecord;
         private IList<string> _securityRecords;
         private IList<string> _securityNotes;
+        private IList<string> _securityAttitudeScc;
+        private IList<string> _securityAttitudeCrew;
 
         private IList<string> _employmentPublicRecord;
         private IList<string> _employmentExperience;
@@ -50,6 +52,8 @@ namespace AuroraRecordGenerator
             _securityPublicRecord = _targetRecord.SecurityPublicRecord?.LineSplit();
             _securityRecords = _targetRecord.SecurityRecords?.LineSplit();
             _securityNotes = _targetRecord.SecurityNotes?.LineSplit();
+            _securityAttitudeCrew = _targetRecord.SecurityAttitudeCrew?.LineSplit();
+            _securityAttitudeScc = _targetRecord.SecurityAttitudeScc?.LineSplit();
 
             // employment
             _employmentPublicRecord = _targetRecord.EmploymentPublicRecord?.LineSplit();
diff --git a/AuroraRecordGenerator/RecordFormatterGenerationMethods.cs b/AuroraRecordGenerator/RecordFormatterGenerationMethods.cs
index 286815d..aba6762 100644
--- a/AuroraRecordGenerator/RecordFormatterGenerationMethods.cs
+++ b/AuroraRecordGenerator/RecordFormatterGenerationMethods.cs
@@ -10,6 +10,8 @@ namespace AuroraRecordGenerator
         {
             var record = new StringBuilder();
             record.AppendLine("/// PUBLIC RECORD ///");
+
+            // TODO: most of this should be replaced by WriteRecordIfAny()
             if (_targetRecord.FirstName.Any())
             {
                 record.AppendLine(MakeNameLine());
@@ -205,7 +207,10 @@ namespace AuroraRecordGenerator
 
             recordText.Append(_commonRecords);
 
-            if (!_securityRecords.Any() && !_securityNotes.Any())
+            if (!_securityRecords.Any() &&
+                !_securityNotes.Any() &&
+                !_securityAttitudeScc.Any() &&
+                !_securityAttitudeCrew.Any())
             {
                 recordText.AppendLine("/// NO SECURITY RECORD FOUND ///");
             }
@@ -214,6 +219,14 @@ namespace AuroraRecordGenerator
                 recordText.AppendLine("/// SECURITY RECORD ///");
                 recordText.AppendLine();
 
+                WriteSectionIfAny(ref recordText,
+                    "Attitude Towards the SCC:",
+                    _securityAttitudeScc);
+
+                WriteSectionIfAny(ref recordText,
+                    "Attitude Towards the Crew:",
+                    _securityAttitudeCrew);
+
                 WriteSectionIfAny(ref recordText,
                     "Notes:",
                     _securityNotes);
diff --git a/AuroraRecordGenerator/Types.cs b/AuroraRecordGenerator/Types.cs
index 74b194e..503851d 100644
--- a/AuroraRecordGenerator/Types.cs
+++ b/AuroraRecordGenerator/Types.cs
@@ -90,6 +90,26 @@ namespace AuroraRecordGenerator
         HumanOffworld
     }
 
+    // Currently unused
+    [ProtoContract]
+    public enum ThreatLevel
+    {
+        [ProtoEnum]
+        Minimal = 0,
+
+        [ProtoEnum]
+        Low,
+
+        [ProtoEnum]
+        Medium,
+
+        [ProtoEnum]
+        High,
+
+        [ProtoEnum]
+        Extreme
+    }
+
     public static class Info
     {
         /// <summary>