diff --git a/schema/v2/cards_schema.json b/schema/v2/cards_schema.json
index e3046153..f3427f2c 100644
--- a/schema/v2/cards_schema.json
+++ b/schema/v2/cards_schema.json
@@ -119,21 +119,6 @@
           },
           "required": ["faces"]
         },
-        {
-          "properties": {
-            "faces": {
-              "items": {
-                "type": "object"
-              },
-              "minItems": 1,
-              "type": "array"
-            },
-            "layout_id": {
-              "const": "copy"
-            }
-          },
-          "required": ["faces"]
-        },
         {
           "properties": {
             "faces": {
@@ -148,21 +133,6 @@
             }
           },
           "required": ["faces"]
-        },
-        {
-          "properties": {
-            "faces": {
-              "items": {
-                "type": "object"
-              },
-              "minItems": 1,
-              "type": "array"
-            },
-            "layout_id": {
-              "const": "progression"
-            }
-          },
-          "required": ["faces"]
         }
       ]
     }
diff --git a/schema/v2/printings_schema.json b/schema/v2/printings_schema.json
index 9a3d7ff8..fa804152 100644
--- a/schema/v2/printings_schema.json
+++ b/schema/v2/printings_schema.json
@@ -68,21 +68,6 @@
               }
             },
             "required": ["faces"]
-          },
-          {
-            "properties": {
-              "faces": {
-                "items": {
-                  "type": "object"
-                },
-                "minItems": 1,
-                "type": "array"
-              },
-              "layout_id": {
-                "const": "progression"
-              }
-            },
-            "required": ["faces"]
           }
         ]
       }
diff --git a/v2/cards/bmi_buffer.json b/v2/cards/bmi_buffer.json
index 44e87820..cd941c1c 100644
--- a/v2/cards/bmi_buffer.json
+++ b/v2/cards/bmi_buffer.json
@@ -3,17 +3,11 @@
   "cost": 3,
   "deck_limit": 3,
   "designed_by": "fantasy_flight_games",
-  "faces": [
-    {
-      "stripped_text": "Whenever a program is trashed from your grip, host it on BMI Buffer instead of adding it to your heap. click click: Install 1 hosted program, ignoring all costs.",
-      "text": "Whenever a program is trashed from your grip, host it on BMI Buffer instead of adding it to your heap.\n[click][click]: Install 1 hosted program, ignoring all costs."
-    }
-  ],
   "faction_id": "neutral_runner",
   "id": "bmi_buffer",
   "influence_cost": 0,
   "is_unique": false,
-  "layout_id": "progression",
+  "layout_id": "normal",
   "side_id": "runner",
   "stripped_text": "Whenever a program is trashed from your grip, host it on BMI Buffer instead of adding it to your heap. click click: Install 1 hosted program (paying all costs).",
   "stripped_title": "BMI Buffer",
diff --git a/v2/cards/bmi_buffer_2.json b/v2/cards/bmi_buffer_2.json
new file mode 100644
index 00000000..58083a35
--- /dev/null
+++ b/v2/cards/bmi_buffer_2.json
@@ -0,0 +1,16 @@
+{
+  "card_type_id": "hardware",
+  "cost": 3,
+  "deck_limit": 3,
+  "designed_by": "fantasy_flight_games",
+  "faction_id": "neutral_runner",
+  "id": "bmi_buffer_2",
+  "influence_cost": 0,
+  "is_unique": false,
+  "layout_id": "normal",
+  "side_id": "runner",
+  "stripped_text": "Whenever a program is trashed from your grip, host it on BMI Buffer instead of adding it to your heap. click click: Install 1 hosted program, ignoring all costs.",
+  "stripped_title": "BMI Buffer 2",
+  "text": "Whenever a program is trashed from your grip, host it on BMI Buffer instead of adding it to your heap.\n[click][click]: Install 1 hosted program, ignoring all costs.",
+  "title": "BMI Buffer 2"
+}
diff --git a/v2/cards/corporate_oversight.json b/v2/cards/corporate_oversight_a.json
similarity index 53%
rename from v2/cards/corporate_oversight.json
rename to v2/cards/corporate_oversight_a.json
index 3bf6c7a0..948c35bd 100644
--- a/v2/cards/corporate_oversight.json
+++ b/v2/cards/corporate_oversight_a.json
@@ -4,21 +4,15 @@
   "card_type_id": "agenda",
   "deck_limit": 3,
   "designed_by": "fantasy_flight_games",
-  "faces": [
-    {
-      "stripped_text": "When you score Corporate Oversight, you may search R&D for a piece of ice. Install and rez it protecting a central server, ignoring all costs. Shuffle R&D. If you win a game with Corporate Oversight in your score area, destroy it.",
-      "text": "When you score Corporate Oversight, you may search R&D for a piece of ice. Install and rez it protecting a central server, ignoring all costs. Shuffle R&D.\nIf you win a game with Corporate Oversight in your score area, destroy it."
-    }
-  ],
   "faction_id": "neutral_corp",
-  "id": "corporate_oversight",
+  "id": "corporate_oversight_a",
   "influence_cost": 0,
   "is_unique": false,
-  "layout_id": "copy",
+  "layout_id": "normal",
   "side_id": "corp",
   "stripped_text": "When you score Corporate Oversight, you may search R&D for a piece of ice. Install and rez it protecting a remote server, ignoring all costs. Shuffle R&D. If you win a game with Corporate Oversight in your score area, destroy it.",
-  "stripped_title": "Corporate Oversight",
+  "stripped_title": "Corporate Oversight A",
   "subtypes": ["initiative"],
   "text": "When you score Corporate Oversight, you may search R&D for a piece of ice. Install and rez it protecting a remote server, ignoring all costs. Shuffle R&D.\nIf you win a game with Corporate Oversight in your score area, destroy it.",
-  "title": "Corporate Oversight"
+  "title": "Corporate Oversight A"
 }
diff --git a/v2/cards/corporate_oversight_b.json b/v2/cards/corporate_oversight_b.json
new file mode 100644
index 00000000..b90ed701
--- /dev/null
+++ b/v2/cards/corporate_oversight_b.json
@@ -0,0 +1,18 @@
+{
+  "advancement_requirement": 2,
+  "agenda_points": 0,
+  "card_type_id": "agenda",
+  "deck_limit": 3,
+  "designed_by": "fantasy_flight_games",
+  "faction_id": "neutral_corp",
+  "id": "corporate_oversight_b",
+  "influence_cost": 0,
+  "is_unique": false,
+  "layout_id": "normal",
+  "side_id": "corp",
+  "stripped_text": "When you score Corporate Oversight, you may search R&D for a piece of ice. Install and rez it protecting a central server, ignoring all costs. Shuffle R&D. If you win a game with Corporate Oversight in your score area, destroy it.",
+  "stripped_title": "Corporate Oversight B",
+  "subtypes": ["initiative"],
+  "text": "When you score Corporate Oversight, you may search R&D for a piece of ice. Install and rez it protecting a central server, ignoring all costs. Shuffle R&D.\nIf you win a game with Corporate Oversight in your score area, destroy it.",
+  "title": "Corporate Oversight B"
+}
diff --git a/v2/cards/evidence_collection.json b/v2/cards/evidence_collection.json
index 859fcafd..e9c28c93 100644
--- a/v2/cards/evidence_collection.json
+++ b/v2/cards/evidence_collection.json
@@ -4,25 +4,11 @@
   "card_type_id": "agenda",
   "deck_limit": 3,
   "designed_by": "fantasy_flight_games",
-  "faces": [
-    {
-      "stripped_text": "When you win a game with Evidence Collection in your score area, reveal set 5.",
-      "text": "When you win a game with Evidence Collection in your score area, reveal set 5."
-    },
-    {
-      "stripped_text": "When you win a game with Evidence Collection in your score area, reveal set 8.",
-      "text": "When you win a game with Evidence Collection in your score area, reveal set 8."
-    },
-    {
-      "stripped_text": "Evidence Collection is worth 1 fewer agenda point while in the Runner's score area.",
-      "text": "Evidence Collection is worth 1 fewer agenda point while in the Runner's score area."
-    }
-  ],
   "faction_id": "neutral_corp",
   "id": "evidence_collection",
   "influence_cost": 0,
   "is_unique": false,
-  "layout_id": "progression",
+  "layout_id": "normal",
   "side_id": "corp",
   "stripped_text": "When you win a game with Evidence Collection in your score area, reveal set 2.",
   "stripped_title": "Evidence Collection",
diff --git a/v2/cards/evidence_collection_2.json b/v2/cards/evidence_collection_2.json
new file mode 100644
index 00000000..f2bf99dc
--- /dev/null
+++ b/v2/cards/evidence_collection_2.json
@@ -0,0 +1,18 @@
+{
+  "advancement_requirement": 3,
+  "agenda_points": 2,
+  "card_type_id": "agenda",
+  "deck_limit": 3,
+  "designed_by": "fantasy_flight_games",
+  "faction_id": "neutral_corp",
+  "id": "evidence_collection_2",
+  "influence_cost": 0,
+  "is_unique": false,
+  "layout_id": "normal",
+  "side_id": "corp",
+  "stripped_text": "When you win a game with Evidence Collection in your score area, reveal set 5.",
+  "stripped_title": "Evidence Collection 2",
+  "subtypes": ["research"],
+  "text": "When you win a game with Evidence Collection in your score area, reveal set 5.",
+  "title": "Evidence Collection 2"
+}
diff --git a/v2/cards/evidence_collection_3.json b/v2/cards/evidence_collection_3.json
new file mode 100644
index 00000000..42e4a7d5
--- /dev/null
+++ b/v2/cards/evidence_collection_3.json
@@ -0,0 +1,18 @@
+{
+  "advancement_requirement": 3,
+  "agenda_points": 2,
+  "card_type_id": "agenda",
+  "deck_limit": 3,
+  "designed_by": "fantasy_flight_games",
+  "faction_id": "neutral_corp",
+  "id": "evidence_collection_3",
+  "influence_cost": 0,
+  "is_unique": false,
+  "layout_id": "normal",
+  "side_id": "corp",
+  "stripped_text": "When you win a game with Evidence Collection in your score area, reveal set 8.",
+  "stripped_title": "Evidence Collection 3",
+  "subtypes": ["research"],
+  "text": "When you win a game with Evidence Collection in your score area, reveal set 8.",
+  "title": "Evidence Collection 3"
+}
diff --git a/v2/cards/evidence_collection_4.json b/v2/cards/evidence_collection_4.json
new file mode 100644
index 00000000..375d791b
--- /dev/null
+++ b/v2/cards/evidence_collection_4.json
@@ -0,0 +1,18 @@
+{
+  "advancement_requirement": 3,
+  "agenda_points": 2,
+  "card_type_id": "agenda",
+  "deck_limit": 3,
+  "designed_by": "fantasy_flight_games",
+  "faction_id": "neutral_corp",
+  "id": "evidence_collection_4",
+  "influence_cost": 0,
+  "is_unique": false,
+  "layout_id": "normal",
+  "side_id": "corp",
+  "stripped_text": "Evidence Collection is worth 1 fewer agenda point while in the Runner's score area.",
+  "stripped_title": "Evidence Collection 4",
+  "subtypes": ["research"],
+  "text": "Evidence Collection is worth 1 fewer agenda point while in the Runner's score area.",
+  "title": "Evidence Collection 4"
+}
diff --git a/v2/cards/investigator_inez_delgado.json b/v2/cards/investigator_inez_delgado.json
index 981f0249..a0905526 100644
--- a/v2/cards/investigator_inez_delgado.json
+++ b/v2/cards/investigator_inez_delgado.json
@@ -3,25 +3,11 @@
   "cost": 0,
   "deck_limit": 3,
   "designed_by": "fantasy_flight_games",
-  "faces": [
-    {
-      "stripped_text": "When you win a game with Investigator Inez Delgado in your score area, reveal set 5. Add Investigator Inez Delgado to your score area as an agenda worth 0 agenda points: Reveal the top 3 cards in R&D. Use this only if you have stolean an agenda this turn.",
-      "text": "When you win a game with Investigator Inez Delgado in your score area, reveal set 5.\n<strong>Add Investigator Inez Delgado to your score area as an agenda worth 0 agenda points:</strong> Reveal the top 3 cards in R&D. Use this only if you have stolean an agenda this turn."
-    },
-    {
-      "stripped_text": "When you win a game with Investigator Inez Delgado in your score area, reveal set 8. Add Investigator Inez Delgado to your score area as an agenda worth 0 agenda points: Reveal each card in HQ. Use this only if you have stolean an agenda this turn.",
-      "text": "When you win a game with Investigator Inez Delgado in your score area, reveal set 8.\n<strong>Add Investigator Inez Delgado to your score area as an agenda worth 0 agenda points:</strong> Reveal each card in HQ. Use this only if you have stolean an agenda this turn."
-    },
-    {
-      "stripped_text": "Add Investigator Inez Delgado to your score area as an agenda worth 0 agenda points: Reveal each card in HQ and the top card of R&D. Use this only if you have stolean an agenda this turn.",
-      "text": "<strong>Add Investigator Inez Delgado to your score area as an agenda worth 0 agenda points:</strong> Reveal each card in HQ and the top card of R&D. Use this only if you have stolean an agenda this turn."
-    }
-  ],
   "faction_id": "neutral_runner",
   "id": "investigator_inez_delgado",
   "influence_cost": 0,
   "is_unique": true,
-  "layout_id": "progression",
+  "layout_id": "normal",
   "side_id": "runner",
   "stripped_text": "When you win a game with Investigator Inez Delgado in your score area, reveal set 2. Add Investigator Inez Delgado to your score area as an agenda worth 0 agenda points: Expose all cards in a remote server. Use this only if you have stolean an agenda this turn.",
   "stripped_title": "Investigator Inez Delgado",
diff --git a/v2/cards/investigator_inez_delgado_2.json b/v2/cards/investigator_inez_delgado_2.json
new file mode 100644
index 00000000..0f7eab6b
--- /dev/null
+++ b/v2/cards/investigator_inez_delgado_2.json
@@ -0,0 +1,17 @@
+{
+  "card_type_id": "resource",
+  "cost": 0,
+  "deck_limit": 3,
+  "designed_by": "fantasy_flight_games",
+  "faction_id": "neutral_runner",
+  "id": "investigator_inez_delgado_2",
+  "influence_cost": 0,
+  "is_unique": true,
+  "layout_id": "normal",
+  "side_id": "runner",
+  "stripped_text": "When you win a game with Investigator Inez Delgado in your score area, reveal set 5. Add Investigator Inez Delgado to your score area as an agenda worth 0 agenda points: Reveal the top 3 cards in R&D. Use this only if you have stolean an agenda this turn.",
+  "stripped_title": "Investigator Inez Delgado 2",
+  "subtypes": ["connection"],
+  "text": "When you win a game with Investigator Inez Delgado in your score area, reveal set 5.\n<strong>Add Investigator Inez Delgado to your score area as an agenda worth 0 agenda points:</strong> Reveal the top 3 cards in R&D. Use this only if you have stolean an agenda this turn.",
+  "title": "Investigator Inez Delgado 2"
+}
diff --git a/v2/cards/investigator_inez_delgado_3.json b/v2/cards/investigator_inez_delgado_3.json
new file mode 100644
index 00000000..155b2bbc
--- /dev/null
+++ b/v2/cards/investigator_inez_delgado_3.json
@@ -0,0 +1,17 @@
+{
+  "card_type_id": "resource",
+  "cost": 0,
+  "deck_limit": 3,
+  "designed_by": "fantasy_flight_games",
+  "faction_id": "neutral_runner",
+  "id": "investigator_inez_delgado_3",
+  "influence_cost": 0,
+  "is_unique": true,
+  "layout_id": "normal",
+  "side_id": "runner",
+  "stripped_text": "When you win a game with Investigator Inez Delgado in your score area, reveal set 8. Add Investigator Inez Delgado to your score area as an agenda worth 0 agenda points: Reveal each card in HQ. Use this only if you have stolean an agenda this turn.",
+  "stripped_title": "Investigator Inez Delgado 3",
+  "subtypes": ["connection"],
+  "text": "When you win a game with Investigator Inez Delgado in your score area, reveal set 8.\n<strong>Add Investigator Inez Delgado to your score area as an agenda worth 0 agenda points:</strong> Reveal each card in HQ. Use this only if you have stolean an agenda this turn.",
+  "title": "Investigator Inez Delgado 3"
+}
diff --git a/v2/cards/investigator_inez_delgado_4.json b/v2/cards/investigator_inez_delgado_4.json
new file mode 100644
index 00000000..7ce104ed
--- /dev/null
+++ b/v2/cards/investigator_inez_delgado_4.json
@@ -0,0 +1,17 @@
+{
+  "card_type_id": "resource",
+  "cost": 0,
+  "deck_limit": 3,
+  "designed_by": "fantasy_flight_games",
+  "faction_id": "neutral_runner",
+  "id": "investigator_inez_delgado_4",
+  "influence_cost": 0,
+  "is_unique": true,
+  "layout_id": "normal",
+  "side_id": "runner",
+  "stripped_text": "Add Investigator Inez Delgado to your score area as an agenda worth 0 agenda points: Reveal each card in HQ and the top card of R&D. Use this only if you have stolean an agenda this turn.",
+  "stripped_title": "Investigator Inez Delgado 4",
+  "subtypes": ["connection"],
+  "text": "<strong>Add Investigator Inez Delgado to your score area as an agenda worth 0 agenda points:</strong> Reveal each card in HQ and the top card of R&D. Use this only if you have stolean an agenda this turn.",
+  "title": "Investigator Inez Delgado 4"
+}
diff --git a/v2/cards/investigator_inez_delgado_a.json b/v2/cards/investigator_inez_delgado_a.json
index 32bfab60..0d2a9616 100644
--- a/v2/cards/investigator_inez_delgado_a.json
+++ b/v2/cards/investigator_inez_delgado_a.json
@@ -3,17 +3,11 @@
   "cost": 0,
   "deck_limit": 3,
   "designed_by": "fantasy_flight_games",
-  "faces": [
-    {
-      "stripped_text": "Whenever the Runner steals an agenda, you may resolve the \"when scored\" ability on that agenda, then swap it with an agenda in your scored area.",
-      "text": "Whenever the Runner steals an agenda, you may resolve the \"when scored\" ability on that agenda, then swap it with an agenda in your scored area."
-    }
-  ],
   "faction_id": "neutral_corp",
   "id": "investigator_inez_delgado_a",
   "influence_cost": 0,
   "is_unique": true,
-  "layout_id": "progression",
+  "layout_id": "normal",
   "side_id": "corp",
   "stripped_text": "Whenever you score an agenda, you may swap it with an agenda in the Runner's score area worth at least 1 point, then resolve the \"when scored\" ability on that agenda.",
   "stripped_title": "Investigator Inez Delgado A",
diff --git a/v2/cards/investigator_inez_delgado_a_2.json b/v2/cards/investigator_inez_delgado_a_2.json
new file mode 100644
index 00000000..b35be0e0
--- /dev/null
+++ b/v2/cards/investigator_inez_delgado_a_2.json
@@ -0,0 +1,18 @@
+{
+  "card_type_id": "asset",
+  "cost": 0,
+  "deck_limit": 3,
+  "designed_by": "fantasy_flight_games",
+  "faction_id": "neutral_corp",
+  "id": "investigator_inez_delgado_a_2",
+  "influence_cost": 0,
+  "is_unique": true,
+  "layout_id": "normal",
+  "side_id": "corp",
+  "stripped_text": "Whenever the Runner steals an agenda, you may resolve the \"when scored\" ability on that agenda, then swap it with an agenda in your scored area.",
+  "stripped_title": "Investigator Inez Delgado A 2",
+  "subtypes": ["character"],
+  "text": "Whenever the Runner steals an agenda, you may resolve the \"when scored\" ability on that agenda, then swap it with an agenda in your scored area.",
+  "title": "Investigator Inez Delgado A 2",
+  "trash_cost": 5
+}
diff --git a/v2/cards/lt_todachine.json b/v2/cards/lt_todachine.json
index be496672..d56d3ef0 100644
--- a/v2/cards/lt_todachine.json
+++ b/v2/cards/lt_todachine.json
@@ -3,17 +3,11 @@
   "cost": 3,
   "deck_limit": 3,
   "designed_by": "fantasy_flight_games",
-  "faces": [
-    {
-      "stripped_text": "Whenever you rez a piece of ice, give the Runner 1 tag. Whenever the Runner accesses cards, he or she accesses 1 fewer card if he or she is tagged (to a minimum of 1 card).",
-      "text": "Whenever you rez a piece of ice, give the Runner 1 tag.\nWhenever the Runner accesses cards, he or she accesses 1 fewer card if he or she is tagged (to a minimum of 1 card)."
-    }
-  ],
   "faction_id": "neutral_corp",
   "id": "lt_todachine",
   "influence_cost": 0,
   "is_unique": true,
-  "layout_id": "progression",
+  "layout_id": "normal",
   "side_id": "corp",
   "stripped_text": "Whenever you rez a piece of ice, give the Runner 1 tag.",
   "stripped_title": "Lt. Todachine",
diff --git a/v2/cards/lt_todachine_2.json b/v2/cards/lt_todachine_2.json
new file mode 100644
index 00000000..f245e578
--- /dev/null
+++ b/v2/cards/lt_todachine_2.json
@@ -0,0 +1,18 @@
+{
+  "card_type_id": "asset",
+  "cost": 3,
+  "deck_limit": 3,
+  "designed_by": "fantasy_flight_games",
+  "faction_id": "neutral_corp",
+  "id": "lt_todachine_2",
+  "influence_cost": 0,
+  "is_unique": true,
+  "layout_id": "normal",
+  "side_id": "corp",
+  "stripped_text": "Whenever you rez a piece of ice, give the Runner 1 tag. Whenever the Runner accesses cards, he or she accesses 1 fewer card if he or she is tagged (to a minimum of 1 card).",
+  "stripped_title": "Lt. Todachine 2",
+  "subtypes": ["character"],
+  "text": "Whenever you rez a piece of ice, give the Runner 1 tag.\nWhenever the Runner accesses cards, he or she accesses 1 fewer card if he or she is tagged (to a minimum of 1 card).",
+  "title": "Lt. Todachine 2",
+  "trash_cost": 5
+}
diff --git a/v2/cards/machicolation.json b/v2/cards/machicolation_a.json
similarity index 53%
rename from v2/cards/machicolation.json
rename to v2/cards/machicolation_a.json
index 621a4e92..a0fcdfdd 100644
--- a/v2/cards/machicolation.json
+++ b/v2/cards/machicolation_a.json
@@ -3,23 +3,16 @@
   "cost": 6,
   "deck_limit": 3,
   "designed_by": "fantasy_flight_games",
-  "faces": [
-    {
-      "stripped_text": "Subroutine Trash 1 resource. Subroutine Trash 1 resource. Subroutine Do 1 net damage. Subroutine The Runner loses click, if able. End the run.",
-      "subtypes": ["code_gate", "destroyer", "ap"],
-      "text": "[subroutine] Trash 1 resource.\n[subroutine] Trash 1 resource.\n[subroutine] Do 1 net damage.\n[subroutine] The Runner loses [click], if able. End the run."
-    }
-  ],
   "faction_id": "neutral_corp",
-  "id": "machicolation",
+  "id": "machicolation_a",
   "influence_cost": 0,
   "is_unique": false,
-  "layout_id": "copy",
+  "layout_id": "normal",
   "side_id": "corp",
   "strength": 4,
   "stripped_text": "Subroutine Trash 1 program. Subroutine Trash 1 program. Subroutine Trash 1 piece of hardware. Subroutine The Runner loses 3 credits, if able. End the run.",
-  "stripped_title": "Machicolation",
+  "stripped_title": "Machicolation A",
   "subtypes": ["code_gate", "destroyer"],
   "text": "[subroutine] Trash 1 program.\n[subroutine] Trash 1 program.\n[subroutine] Trash 1 piece of hardware.\n[subroutine] The Runner loses 3[credit], if able. End the run.",
-  "title": "Machicolation"
+  "title": "Machicolation A"
 }
diff --git a/v2/cards/machicolation_b.json b/v2/cards/machicolation_b.json
new file mode 100644
index 00000000..4c880839
--- /dev/null
+++ b/v2/cards/machicolation_b.json
@@ -0,0 +1,18 @@
+{
+  "card_type_id": "ice",
+  "cost": 6,
+  "deck_limit": 3,
+  "designed_by": "fantasy_flight_games",
+  "faction_id": "neutral_corp",
+  "id": "machicolation_b",
+  "influence_cost": 0,
+  "is_unique": false,
+  "layout_id": "normal",
+  "side_id": "corp",
+  "strength": 4,
+  "stripped_text": "Subroutine Trash 1 resource. Subroutine Trash 1 resource. Subroutine Do 1 net damage. Subroutine The Runner loses click, if able. End the run.",
+  "stripped_title": "Machicolation B",
+  "subtypes": ["code_gate", "destroyer", "ap"],
+  "text": "[subroutine] Trash 1 resource.\n[subroutine] Trash 1 resource.\n[subroutine] Do 1 net damage.\n[subroutine] The Runner loses [click], if able. End the run.",
+  "title": "Machicolation B"
+}
diff --git a/v2/cards/sneakdoor_prime.json b/v2/cards/sneakdoor_prime_a.json
similarity index 53%
rename from v2/cards/sneakdoor_prime.json
rename to v2/cards/sneakdoor_prime_a.json
index 46dde8b0..51352dbc 100644
--- a/v2/cards/sneakdoor_prime.json
+++ b/v2/cards/sneakdoor_prime_a.json
@@ -3,21 +3,15 @@
   "cost": 6,
   "deck_limit": 3,
   "designed_by": "fantasy_flight_games",
-  "faces": [
-    {
-      "stripped_text": "click,click: Make a run on a central server. If successful, instead treat it as a successful run on a remote server.",
-      "text": "[click],[click]: Make a run on a central server. If successful, instead treat it as a successful run on a remote server."
-    }
-  ],
   "faction_id": "neutral_runner",
-  "id": "sneakdoor_prime",
+  "id": "sneakdoor_prime_a",
   "influence_cost": 0,
   "is_unique": false,
-  "layout_id": "copy",
+  "layout_id": "normal",
   "memory_cost": 2,
   "side_id": "runner",
   "stripped_text": "click,click: Make a run on a remote server. If successful, instead treat it as a successful run on a central server.",
-  "stripped_title": "Sneakdoor Prime",
+  "stripped_title": "Sneakdoor Prime A",
   "text": "[click],[click]: Make a run on a remote server. If successful, instead treat it as a successful run on a central server.",
-  "title": "Sneakdoor Prime"
+  "title": "Sneakdoor Prime A"
 }
diff --git a/v2/cards/sneakdoor_prime_b.json b/v2/cards/sneakdoor_prime_b.json
new file mode 100644
index 00000000..36a2e5dc
--- /dev/null
+++ b/v2/cards/sneakdoor_prime_b.json
@@ -0,0 +1,17 @@
+{
+  "card_type_id": "program",
+  "cost": 6,
+  "deck_limit": 3,
+  "designed_by": "fantasy_flight_games",
+  "faction_id": "neutral_runner",
+  "id": "sneakdoor_prime_b",
+  "influence_cost": 0,
+  "is_unique": false,
+  "layout_id": "normal",
+  "memory_cost": 2,
+  "side_id": "runner",
+  "stripped_text": "click,click: Make a run on a central server. If successful, instead treat it as a successful run on a remote server.",
+  "stripped_title": "Sneakdoor Prime B",
+  "text": "[click],[click]: Make a run on a central server. If successful, instead treat it as a successful run on a remote server.",
+  "title": "Sneakdoor Prime B"
+}
diff --git a/v2/cards/surveillance_network_key.json b/v2/cards/surveillance_network_key.json
index d974656e..17b695f3 100644
--- a/v2/cards/surveillance_network_key.json
+++ b/v2/cards/surveillance_network_key.json
@@ -3,17 +3,11 @@
   "cost": 2,
   "deck_limit": 3,
   "designed_by": "fantasy_flight_games",
-  "faces": [
-    {
-      "stripped_text": "Whenever the Corp spends click to draw 1 or more cards (including through a card ability), reveal the first card drawn. 2 credits: For the remainder of this run, access 1 additional card whenever you access cards from HQ or R&D. Use this ability only once per turn.",
-      "text": "Whenever the Corp spends [click] to draw 1 or more cards (including through a card ability), reveal the first card drawn.\n2[credit]: For the remainder of this run, access 1 additional card whenever you access cards from HQ or R&D. Use this ability only once per turn."
-    }
-  ],
   "faction_id": "neutral_runner",
   "id": "surveillance_network_key",
   "influence_cost": 0,
   "is_unique": false,
-  "layout_id": "progression",
+  "layout_id": "normal",
   "memory_cost": 1,
   "side_id": "runner",
   "stripped_text": "Whenever the Corp spends click to draw 1 or more cards (including through a card ability), reveal the first card drawn.",
diff --git a/v2/cards/surveillance_network_key_2.json b/v2/cards/surveillance_network_key_2.json
new file mode 100644
index 00000000..612d7db8
--- /dev/null
+++ b/v2/cards/surveillance_network_key_2.json
@@ -0,0 +1,17 @@
+{
+  "card_type_id": "program",
+  "cost": 2,
+  "deck_limit": 3,
+  "designed_by": "fantasy_flight_games",
+  "faction_id": "neutral_runner",
+  "id": "surveillance_network_key_2",
+  "influence_cost": 0,
+  "is_unique": false,
+  "layout_id": "normal",
+  "memory_cost": 1,
+  "side_id": "runner",
+  "stripped_text": "Whenever the Corp spends click to draw 1 or more cards (including through a card ability), reveal the first card drawn. 2 credits: For the remainder of this run, access 1 additional card whenever you access cards from HQ or R&D. Use this ability only once per turn.",
+  "stripped_title": "Surveillance Network Key 2",
+  "text": "Whenever the Corp spends [click] to draw 1 or more cards (including through a card ability), reveal the first card drawn.\n2[credit]: For the remainder of this run, access 1 additional card whenever you access cards from HQ or R&D. Use this ability only once per turn.",
+  "title": "Surveillance Network Key 2"
+}
diff --git a/v2/cards/the_masque.json b/v2/cards/the_masque.json
deleted file mode 100644
index 419245b7..00000000
--- a/v2/cards/the_masque.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "card_type_id": "resource",
-  "cost": 1,
-  "deck_limit": 3,
-  "designed_by": "fantasy_flight_games",
-  "faces": [
-    {
-      "stripped_text": "click,trash: Make a run and gain click. If that run is successful when it ends, you may immediately make another run on another server.",
-      "text": "[click],[trash]: Make a run and gain [click]. If that run is successful when it ends, you may immediately make another run on another server."
-    }
-  ],
-  "faction_id": "neutral_runner",
-  "id": "the_masque",
-  "influence_cost": 0,
-  "is_unique": true,
-  "layout_id": "copy",
-  "side_id": "runner",
-  "stripped_text": "click,trash: Make a run and gain click. If successful, draw 1 card.",
-  "stripped_title": "The Masque",
-  "subtypes": ["connection"],
-  "text": "[click],[trash]: Make a run and gain [click]. If successful, draw 1 card.",
-  "title": "The Masque"
-}
diff --git a/v2/cards/the_masque_a.json b/v2/cards/the_masque_a.json
new file mode 100644
index 00000000..21e1a59b
--- /dev/null
+++ b/v2/cards/the_masque_a.json
@@ -0,0 +1,17 @@
+{
+  "card_type_id": "resource",
+  "cost": 1,
+  "deck_limit": 3,
+  "designed_by": "fantasy_flight_games",
+  "faction_id": "neutral_runner",
+  "id": "the_masque_a",
+  "influence_cost": 0,
+  "is_unique": true,
+  "layout_id": "normal",
+  "side_id": "runner",
+  "stripped_text": "click,trash: Make a run and gain click. If successful, draw 1 card.",
+  "stripped_title": "The Masque A",
+  "subtypes": ["connection"],
+  "text": "[click],[trash]: Make a run and gain [click]. If successful, draw 1 card.",
+  "title": "The Masque A"
+}
diff --git a/v2/cards/the_masque_b.json b/v2/cards/the_masque_b.json
new file mode 100644
index 00000000..2c724a3d
--- /dev/null
+++ b/v2/cards/the_masque_b.json
@@ -0,0 +1,17 @@
+{
+  "card_type_id": "resource",
+  "cost": 1,
+  "deck_limit": 3,
+  "designed_by": "fantasy_flight_games",
+  "faction_id": "neutral_runner",
+  "id": "the_masque_b",
+  "influence_cost": 0,
+  "is_unique": true,
+  "layout_id": "normal",
+  "side_id": "runner",
+  "stripped_text": "click,trash: Make a run and gain click. If that run is successful when it ends, you may immediately make another run on another server.",
+  "stripped_title": "The Masque B",
+  "subtypes": ["connection"],
+  "text": "[click],[trash]: Make a run and gain [click]. If that run is successful when it ends, you may immediately make another run on another server.",
+  "title": "The Masque B"
+}
diff --git a/v2/printings/terminal_directive_campaign.json b/v2/printings/terminal_directive_campaign.json
index 06f34266..8da58a95 100644
--- a/v2/printings/terminal_directive_campaign.json
+++ b/v2/printings/terminal_directive_campaign.json
@@ -8,12 +8,48 @@
     "quantity": 3,
     "released_by": "fantasy_flight_games"
   },
+  {
+    "card_id": "evidence_collection_2",
+    "card_set_id": "terminal_directive_campaign",
+    "id": "14001",
+    "illustrator": "Dmitry Burmak",
+    "position": 2,
+    "quantity": 3,
+    "released_by": "fantasy_flight_games"
+  },
+  {
+    "card_id": "evidence_collection_3",
+    "card_set_id": "terminal_directive_campaign",
+    "id": "14002",
+    "illustrator": "Dmitry Burmak",
+    "position": 3,
+    "quantity": 3,
+    "released_by": "fantasy_flight_games"
+  },
+  {
+    "card_id": "evidence_collection_4",
+    "card_set_id": "terminal_directive_campaign",
+    "id": "14003",
+    "illustrator": "Dmitry Burmak",
+    "position": 4,
+    "quantity": 3,
+    "released_by": "fantasy_flight_games"
+  },
   {
     "card_id": "investigator_inez_delgado_a",
     "card_set_id": "terminal_directive_campaign",
     "id": "14004",
     "illustrator": "PxelSlayer",
-    "position": 2,
+    "position": 5,
+    "quantity": 3,
+    "released_by": "fantasy_flight_games"
+  },
+  {
+    "card_id": "investigator_inez_delgado_a_2",
+    "card_set_id": "terminal_directive_campaign",
+    "id": "14005",
+    "illustrator": "PxelSlayer",
+    "position": 6,
     "quantity": 3,
     "released_by": "fantasy_flight_games"
   },
@@ -22,7 +58,16 @@
     "card_set_id": "terminal_directive_campaign",
     "id": "14006",
     "illustrator": "Antonio José Manzanedo",
-    "position": 3,
+    "position": 7,
+    "quantity": 3,
+    "released_by": "fantasy_flight_games"
+  },
+  {
+    "card_id": "lt_todachine_2",
+    "card_set_id": "terminal_directive_campaign",
+    "id": "14007",
+    "illustrator": "Antonio José Manzanedo",
+    "position": 8,
     "quantity": 3,
     "released_by": "fantasy_flight_games"
   },
@@ -31,7 +76,7 @@
     "card_set_id": "terminal_directive_campaign",
     "id": "14008",
     "illustrator": "Ethan Patrick Harris",
-    "position": 4,
+    "position": 9,
     "quantity": 3,
     "released_by": "fantasy_flight_games"
   },
@@ -40,40 +85,48 @@
     "card_set_id": "terminal_directive_campaign",
     "id": "14023",
     "illustrator": "Adam S. Doyle",
-    "position": 5,
+    "position": 10,
     "quantity": 1,
     "released_by": "fantasy_flight_games"
   },
   {
-    "card_id": "machicolation",
+    "card_id": "machicolation_a",
     "card_set_id": "terminal_directive_campaign",
     "copy_quantity": 3,
-    "faces": [
-      {
-        "copy_quantity": 3
-      }
-    ],
     "id": "14010",
     "illustrator": "Ed Mattinian",
-    "layout_id": "copy",
-    "position": 6,
-    "quantity": 6,
+    "position": 11,
+    "quantity": 3,
+    "released_by": "fantasy_flight_games"
+  },
+  {
+    "card_id": "machicolation_b",
+    "card_set_id": "terminal_directive_campaign",
+    "copy_quantity": 3,
+    "id": "14011",
+    "illustrator": "Ed Mattinian",
+    "position": 12,
+    "quantity": 3,
     "released_by": "fantasy_flight_games"
   },
   {
-    "card_id": "corporate_oversight",
+    "card_id": "corporate_oversight_a",
     "card_set_id": "terminal_directive_campaign",
     "copy_quantity": 3,
-    "faces": [
-      {
-        "copy_quantity": 3
-      }
-    ],
     "id": "14012",
     "illustrator": "Matt Zeilinger",
-    "layout_id": "copy",
-    "position": 7,
-    "quantity": 6,
+    "position": 13,
+    "quantity": 3,
+    "released_by": "fantasy_flight_games"
+  },
+  {
+    "card_id": "corporate_oversight_b",
+    "card_set_id": "terminal_directive_campaign",
+    "copy_quantity": 3,
+    "id": "14013",
+    "illustrator": "Matt Zeilinger",
+    "position": 14,
+    "quantity": 3,
     "released_by": "fantasy_flight_games"
   },
   {
@@ -81,7 +134,34 @@
     "card_set_id": "terminal_directive_campaign",
     "id": "14014",
     "illustrator": "Matt Zeilinger",
-    "position": 8,
+    "position": 15,
+    "quantity": 3,
+    "released_by": "fantasy_flight_games"
+  },
+  {
+    "card_id": "investigator_inez_delgado_2",
+    "card_set_id": "terminal_directive_campaign",
+    "id": "14015",
+    "illustrator": "Matt Zeilinger",
+    "position": 16,
+    "quantity": 3,
+    "released_by": "fantasy_flight_games"
+  },
+  {
+    "card_id": "investigator_inez_delgado_3",
+    "card_set_id": "terminal_directive_campaign",
+    "id": "14016",
+    "illustrator": "Matt Zeilinger",
+    "position": 17,
+    "quantity": 3,
+    "released_by": "fantasy_flight_games"
+  },
+  {
+    "card_id": "investigator_inez_delgado_4",
+    "card_set_id": "terminal_directive_campaign",
+    "id": "14017",
+    "illustrator": "Matt Zeilinger",
+    "position": 18,
     "quantity": 3,
     "released_by": "fantasy_flight_games"
   },
@@ -90,7 +170,16 @@
     "card_set_id": "terminal_directive_campaign",
     "id": "14018",
     "illustrator": "Michał Miłkowski",
-    "position": 9,
+    "position": 19,
+    "quantity": 3,
+    "released_by": "fantasy_flight_games"
+  },
+  {
+    "card_id": "surveillance_network_key_2",
+    "card_set_id": "terminal_directive_campaign",
+    "id": "14019",
+    "illustrator": "Michał Miłkowski",
+    "position": 20,
     "quantity": 3,
     "released_by": "fantasy_flight_games"
   },
@@ -99,7 +188,16 @@
     "card_set_id": "terminal_directive_campaign",
     "id": "14020",
     "illustrator": "Timur Shevtsov",
-    "position": 10,
+    "position": 21,
+    "quantity": 3,
+    "released_by": "fantasy_flight_games"
+  },
+  {
+    "card_id": "bmi_buffer_2",
+    "card_set_id": "terminal_directive_campaign",
+    "id": "14021",
+    "illustrator": "Timur Shevtsov",
+    "position": 22,
     "quantity": 3,
     "released_by": "fantasy_flight_games"
   },
@@ -108,7 +206,7 @@
     "card_set_id": "terminal_directive_campaign",
     "id": "14022",
     "illustrator": "Adam Schumpert",
-    "position": 11,
+    "position": 23,
     "quantity": 3,
     "released_by": "fantasy_flight_games"
   },
@@ -117,40 +215,48 @@
     "card_set_id": "terminal_directive_campaign",
     "id": "14009",
     "illustrator": "Jason Juta",
-    "position": 12,
+    "position": 24,
     "quantity": 1,
     "released_by": "fantasy_flight_games"
   },
   {
-    "card_id": "the_masque",
+    "card_id": "the_masque_a",
     "card_set_id": "terminal_directive_campaign",
     "copy_quantity": 3,
-    "faces": [
-      {
-        "copy_quantity": 3
-      }
-    ],
     "id": "14024",
     "illustrator": "PxelSlayer",
-    "layout_id": "copy",
-    "position": 13,
-    "quantity": 6,
+    "position": 25,
+    "quantity": 3,
     "released_by": "fantasy_flight_games"
   },
   {
-    "card_id": "sneakdoor_prime",
+    "card_id": "the_masque_b",
+    "card_set_id": "terminal_directive_campaign",
+    "copy_quantity": 3,
+    "id": "14025",
+    "illustrator": "PxelSlayer",
+    "position": 26,
+    "quantity": 3,
+    "released_by": "fantasy_flight_games"
+  },
+  {
+    "card_id": "sneakdoor_prime_a",
     "card_set_id": "terminal_directive_campaign",
     "copy_quantity": 3,
-    "faces": [
-      {
-        "copy_quantity": 3
-      }
-    ],
     "id": "14026",
     "illustrator": "Dmitry Prosvirnin",
-    "layout_id": "copy",
-    "position": 14,
-    "quantity": 6,
+    "position": 27,
+    "quantity": 3,
+    "released_by": "fantasy_flight_games"
+  },
+  {
+    "card_id": "sneakdoor_prime_b",
+    "card_set_id": "terminal_directive_campaign",
+    "copy_quantity": 3,
+    "id": "14027",
+    "illustrator": "Dmitry Prosvirnin",
+    "position": 28,
+    "quantity": 3,
     "released_by": "fantasy_flight_games"
   }
 ]