diff --git a/bin/gendb.py b/bin/gendb.py
index 24ad979..9645050 100644
--- a/bin/gendb.py
+++ b/bin/gendb.py
@@ -49,7 +49,7 @@ def main():
         print("{}".format(e))
 
     # Load in the yaml data
-    with open('basics.yaml') as yl:
+    with open('basics.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     # call the functions to input to SQL
     do_abilityscore(data['abilityscore'], conn)
@@ -62,96 +62,96 @@ def main():
     do_weaponcategory(data['weaponcategory'], conn)
 
     # move on to traits
-    with open('traits.yaml') as yl:
+    with open('traits.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_traits(data, conn)  # does both trait types and traits
 
     # move on to sources
-    with open('sources.yaml') as yl:
+    with open('sources.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_sources(data, conn)
     do_source_entry_table(conn)
 
     # move on to senses
-    with open('senses.yaml') as yl:
+    with open('senses.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_senses(data, conn)
 
     # move on to skills
-    with open('skills.yaml') as yl:
+    with open('skills.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_skills(data, conn)
 
     # move on to damagecategory and damagetype
-    with open('damage.yaml') as yl:
+    with open('damage.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_damage(data, conn)
 
     # move on to conditions
-    with open('conditions.yaml') as yl:
+    with open('conditions.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_conditions(data, conn)
 
     # move on to backgrounds
-    with open('backgrounds.yaml') as yl:
+    with open('backgrounds.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_backgrounds(data, conn)
 
     # move on to bulks
-    with open('bulks.yaml') as yl:
+    with open('bulks.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_bulks(data, conn)
 
     # move on to langs
-    with open('langs.yaml') as yl:
+    with open('langs.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_langs(data, conn)
 
     # move on to actions
-    with open('actions.yaml') as yl:
+    with open('actions.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_actions(data, conn)
 
     # move on to spells
     # TODO do spells once data is proofread
-    with open('spells.yaml') as yl:
+    with open('spells.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_spells(data, conn)
 
     # move on to requirements
-    with open('requirements.yaml') as yl:
+    with open('requirements.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_requirements(data, conn)
 
     # move on to triggers
-    with open('triggers.yaml') as yl:
+    with open('triggers.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_triggers(data, conn)
 
     # move on to armor
-    with open('armor.yaml') as yl:
+    with open('armor.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_armor(data, conn)
 
     # move on to ammo
-    with open('ammunition.yaml') as yl:
+    with open('ammunition.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_ammo(data, conn)
 
-    with open('gear.yaml') as yl:
+    with open('gear.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_gear(data, conn)
 
-    with open('feats.yaml') as yl:
+    with open('feats.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_feats(data, conn)
 
-    with open('ancestriesheritages.yaml') as yl:
+    with open('ancestriesheritages.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_ancestries(data, conn)
 
     # Must be called after feats are loaded
-    with open('ancestriesheritages.yaml') as yl:
+    with open('ancestriesheritages.yaml', encoding='utf-8') as yl:
         data = yaml.full_load(yl)
     do_heritages(data, conn)
 
diff --git a/data/basics.yaml b/data/basics.yaml
index 4b34bab..c171536 100644
--- a/data/basics.yaml
+++ b/data/basics.yaml
@@ -1,135 +1,140 @@
 abilityscore:
-- flag_rep: 1
-  long_name: Strength
-  short_name: STR
-- flag_rep: 2
-  long_name: Dexterity
-  short_name: DEX
-- flag_rep: 4
-  long_name: Constitution
-  short_name: CON
-- flag_rep: 8
-  long_name: Intelligence
-  short_name: INT
-- flag_rep: 16
-  long_name: Wisdom
-  short_name: WIS
-- flag_rep: 32
-  long_name: Charisma
-  short_name: CHA
-- flag_rep: 64
-  long_name: Free 1
-  short_name: Free1
-- flag_rep: 128
-  long_name: Free 2
-  short_name: Free2
+  - flag_rep: 1
+    long_name: Strength
+    short_name: STR
+  - flag_rep: 2
+    long_name: Dexterity
+    short_name: DEX
+  - flag_rep: 4
+    long_name: Constitution
+    short_name: CON
+  - flag_rep: 8
+    long_name: Intelligence
+    short_name: INT
+  - flag_rep: 16
+    long_name: Wisdom
+    short_name: WIS
+  - flag_rep: 32
+    long_name: Charisma
+    short_name: CHA
+  - flag_rep: 64
+    long_name: Free 1
+    short_name: Free1
+  - flag_rep: 128
+    long_name: Free 2
+    short_name: Free2
 actioncost:
-- abbr: 1
-  name: Single Action
-- abbr: 2
-  name: Two Actions
-- abbr: 3
-  name: Three Actions
-- abbr: F
-  name: Free Action
-- abbr: R
-  name: Reaction
-- abbr: V
-  name: Varies
-- abbr: 1m
-  name: 1 minute
-- abbr: 10m
-  name: 10 minutes
-- abbr: 1h
-  name: 1 hour
+  - abbr: 1
+    name: Single Action
+  - abbr: 2
+    name: Two Actions
+  - abbr: 3
+    name: Three Actions
+  - abbr: F
+    name: Free Action
+  - abbr: R
+    name: Reaction
+  - abbr: V
+    name: Varies
+  - abbr: 1m
+    name: 1 minute
+  - abbr: 10m
+    name: 10 minutes
+  - abbr: 1h
+    name: 1 hour
 alignment:
-- abbr: LG
-  name: Lawful Good
-- abbr: NG
-  name: Neutral Good
-- abbr: CG
-  name: Chaotic Good
-- abbr: LN
-  name: Lawful Neutral
-- abbr: N
-  name: True Neutral
-- abbr: CN
-  name: Chaotic Neutral
-- abbr: LE
-  name: Lawful Evil
-- abbr: NE
-  name: Neutral Evil
-- abbr: CE
-  name: Chaotic Evil
+  - abbr: LG
+    name: Lawful Good
+  - abbr: NG
+    name: Neutral Good
+  - abbr: CG
+    name: Chaotic Good
+  - abbr: LN
+    name: Lawful Neutral
+  - abbr: N
+    name: True Neutral
+  - abbr: CN
+    name: Chaotic Neutral
+  - abbr: LE
+    name: Lawful Evil
+  - abbr: NE
+    name: Neutral Evil
+  - abbr: CE
+    name: Chaotic Evil
 frequency:
-- once per round
-- once per turn
-- once per minute
-- once every 10 minutes
-- once per hour
-- once per day
+  - once per round
+  - once per turn
+  - once per minute
+  - once every 10 minutes
+  - once per hour
+  - once per day
 lang_rarity:
-- Common
-- Uncommon
-- Secret
+  - Common
+  - Uncommon
+  - Secret
 movement:
-- Air Walk (constant)
-- Burrow
-- Burrow (sand only)
-- Burrow (snow only)
-- Can't Move
-- Climb
-- Climb Stone
-- Cloud Walk
-- Compression
-- Earth Glide
-- Fly
-- Fly (from fly)
-- Freedom of Movement (constant)
-- Glide
-- Ice Climb
-- Ice Stride
-- Land
-- Magma Swim
-- Powerful Jumper
-- Sand Glide
-- Spider Climb (constant)
-- Suction
-- Swim
-- Swamp Stride
-- Swiftness
-- Trickster's Step
-- Trackless Step
-- Unstoppable Burrow
-- Walk in Shadow
-- Woodland Stride
+  - Air Walk (constant)
+  - Burrow
+  - Burrow (sand only)
+  - Burrow (snow only)
+  - Can't Move
+  - Climb
+  - Climb Stone
+  - Cloud Walk
+  - Compression
+  - Earth Glide
+  - Fly
+  - Fly (from fly)
+  - Freedom of Movement (constant)
+  - Glide
+  - Ice Climb
+  - Ice Stride
+  - Land
+  - Magma Swim
+  - Powerful Jumper
+  - Sand Glide
+  - Spider Climb (constant)
+  - Suction
+  - Swim
+  - Swamp Stride
+  - Swiftness
+  - Trickster's Step
+  - Trackless Step
+  - Unstoppable Burrow
+  - Walk in Shadow
+  - Woodland Stride
 size:
-- name: Tiny
-  reach_long_ft: 0
-  reach_tall_ft: 0
-  space_in_ft: 4
-- name: Small
-  reach_long_ft: 5
-  reach_tall_ft: 5
-  space_in_ft: 5
-- name: Medium
-  reach_long_ft: 5
-  reach_tall_ft: 5
-  space_in_ft: 5
-- name: Large
-  reach_long_ft: 5
-  reach_tall_ft: 10
-  space_in_ft: 10
-- name: Huge
-  reach_long_ft: 10
-  reach_tall_ft: 15
-  space_in_ft: 15
-- name: Gargantuan
-  reach_long_ft: 15
-  reach_tall_ft: 20
-  space_in_ft: 20
+  - name: Tiny
+    reach_long_ft: 0
+    reach_tall_ft: 0
+    space_in_ft: 4
+  - name: Small
+    reach_long_ft: 5
+    reach_tall_ft: 5
+    space_in_ft: 5
+  - name: Medium
+    reach_long_ft: 5
+    reach_tall_ft: 5
+    space_in_ft: 5
+  - name: Large
+    reach_long_ft: 5
+    reach_tall_ft: 10
+    space_in_ft: 10
+  - name: Huge
+    reach_long_ft: 10
+    reach_tall_ft: 15
+    space_in_ft: 15
+  - name: Gargantuan
+    reach_long_ft: 15
+    reach_tall_ft: 20
+    space_in_ft: 20
 weaponcategory:
-- Unarmed
-- Simple
-- Martial
-- Advanced
+  - Unarmed
+  - Simple
+  - Martial
+  - Advanced
+bonutypes:
+  - Proficiency
+  - Circumstance
+  - Status
+  - Item