diff --git a/data/yaml/tmp-sql-to-weapons.py b/data/yaml/tmp-sql-to-weapons.py
index 97ab2d5..bb04827 100644
--- a/data/yaml/tmp-sql-to-weapons.py
+++ b/data/yaml/tmp-sql-to-weapons.py
@@ -3,44 +3,91 @@ import yaml
 import pprint
 
 def main():
-    pp = pprint.PrettyPrinter(indent=2)
+    pp = pprint.PrettyPrinter(indent=4)
     conn = sqlite3.connect('../../pf2.db')
     conn.row_factory = sqlite3.Row
 
+    # DO WEAPON GROUPS
+
     q = """
     SELECT
-    price_gp,
-    dice_size,
-    bulk,
-    hands,
-    range,
-    reload,
+    sources_pages,
     name,
-    descr,
-    (SELECT name FROM actions) as action_name -- use this as template for subqueries
-    FROM weapons;
+    descr
+    FROM weapongroups
     """
 
     c = conn.cursor()
     c.execute(q)
     data = [dict(row) for row in c.fetchall()]
-    for i in data:
-        # handle empty bulk entries to match the abbr field in bulks.yaml
-        if i['bulk'] == '':
-            i['bulk'] = '-'
-        # convert gp prices to cp prices to avoid float issues
-        if i['price_gp'] == '':
-            i['price_gp'] = '0'
-        i['price_cp'] = int(float(i['price_gp']) * 100)
-        del i['price_gp']
-
     pp.pprint(data)
 
-    fdata = {'weapons': data}
-    final = yaml.safe_dump(fdata, allow_unicode=True)
-    with open('tmp-weapons.yaml', 'w') as f:
+            # "source": [
+            #     {
+            #         'abbr': 'CRB',
+            #         'page_start': int(i['sources_pages']),
+            #         'page_stop': int(i['sources_pages'])
+            #     },
+
+    wgdata = []
+    for i in data:
+        res = {
+            'name': i['name'],
+            'descr': i['descr'],
+            'source': [
+                {
+                    'abbr': 'CRB',
+                    'page_start': int(i['sources_pages']),
+                    'page_stop': int(i['sources_pages'])
+                }
+            ]
+        }
+        wgdata.append(res)
+
+    pp.pprint(wgdata)
+    finalwgdata = {'weapongroups': wgdata}
+    pp.pprint(finalwgdata)
+
+    final = yaml.safe_dump(finalwgdata, allow_unicode=True)
+    with open('tmp-weapongroups.yaml', 'w') as f:
         f.write(final)
 
+    # DO WEAPONS
+
+    # q = """
+    # SELECT
+    # price_gp,
+    # dice_size,
+    # bulk,
+    # hands,
+    # range,
+    # reload,
+    # name,
+    # descr,
+    # (SELECT name FROM actions) as action_name -- use this as template for subqueries
+    # FROM weapons;
+    # """
+
+    # c = conn.cursor()
+    # c.execute(q)
+    # data = [dict(row) for row in c.fetchall()]
+    # for i in data:
+    #     # handle empty bulk entries to match the abbr field in bulks.yaml
+    #     if i['bulk'] == '':
+    #         i['bulk'] = '-'
+    #     # convert gp prices to cp prices to avoid float issues
+    #     if i['price_gp'] == '':
+    #         i['price_gp'] = '0'
+    #     i['price_cp'] = int(float(i['price_gp']) * 100)
+    #     del i['price_gp']
+
+    # pp.pprint(data)
+
+    # fdata = {'weapons': data}
+    # final = yaml.safe_dump(fdata, allow_unicode=True)
+    # with open('tmp-weapons.yaml', 'w') as f:
+    #     f.write(final)
+
 
 
 if __name__ == '__main__':
diff --git a/data/yaml/weapongroups.yaml b/data/yaml/weapongroups.yaml
new file mode 100644
index 0000000..28a5c71
--- /dev/null
+++ b/data/yaml/weapongroups.yaml
@@ -0,0 +1,91 @@
+weapongroups:
+- descr: TODO descr from pg 283-84
+  name: Axe
+  source:
+  - abbr: CRB
+    page_start: 283
+    page_stop: 283
+- descr: TODO descr from pg 283-84
+  name: Bomb
+  source:
+  - abbr: CRB
+    page_start: 284
+    page_stop: 284
+- descr: TODO descr from pg 283-84
+  name: Bow
+  source:
+  - abbr: CRB
+    page_start: 284
+    page_stop: 284
+- descr: TODO descr from pg 283-84
+  name: Brawling
+  source:
+  - abbr: CRB
+    page_start: 284
+    page_stop: 284
+- descr: TODO descr from pg 283-84
+  name: Club
+  source:
+  - abbr: CRB
+    page_start: 284
+    page_stop: 284
+- descr: TODO descr from pg 283-84
+  name: Dart
+  source:
+  - abbr: CRB
+    page_start: 284
+    page_stop: 284
+- descr: TODO descr from pg 283-84
+  name: Flail
+  source:
+  - abbr: CRB
+    page_start: 284
+    page_stop: 284
+- descr: TODO descr from pg 283-84
+  name: Hammer
+  source:
+  - abbr: CRB
+    page_start: 284
+    page_stop: 284
+- descr: TODO descr from pg 283-84
+  name: Knife
+  source:
+  - abbr: CRB
+    page_start: 284
+    page_stop: 284
+- descr: TODO descr from pg 283-84
+  name: Pick
+  source:
+  - abbr: CRB
+    page_start: 284
+    page_stop: 284
+- descr: TODO descr from pg 283-84
+  name: Polearm
+  source:
+  - abbr: CRB
+    page_start: 284
+    page_stop: 284
+- descr: TODO descr from pg 283-84
+  name: Shield
+  source:
+  - abbr: CRB
+    page_start: 284
+    page_stop: 284
+- descr: TODO descr from pg 283-84
+  name: Sling
+  source:
+  - abbr: CRB
+    page_start: 284
+    page_stop: 284
+- descr: TODO descr from pg 283-84
+  name: Spear
+  source:
+  - abbr: CRB
+    page_start: 284
+    page_stop: 284
+- descr: TODO descr from pg 283-84
+  name: Sword
+  source:
+  - abbr: CRB
+    page_start: 284
+    page_stop: 284