diff --git a/data/scripts/main.js b/data/scripts/main.js
index 586bd8a9..11e11e1b 100644
--- a/data/scripts/main.js
+++ b/data/scripts/main.js
@@ -3,7 +3,7 @@
 //============================================//
 /* Test things! */
 function testFunction() {
-    cardMaster.insertBefore(frameList[5].cardMasterElement("Full"), cardMaster.children[0]);
+    cardMaster.insertBefore(frameList[5].cardMasterElement("Full"), cardMaster.children[newFrameInsertionLocation]);
     cardMasterUpdated();
 	// console.log("First frame manually loaded")
 }
@@ -28,7 +28,8 @@ function initiate() {
 	document.getElementById("displayCanvas").width = cardWidth;
 	document.getElementById("displayCanvas").height = cardHeight;
 	window.displayContext = displayCanvas.getContext("2d");
-    window.textCanvasesPadding = 100
+    window.textCanvasesPadding = 100;
+    window.newFrameInsertionLocation = 1;
 	newCanvas("frameMask");
 	newCanvas("frameFinal");
 	newCanvas("text");
@@ -209,7 +210,7 @@ function addFrameToCardMaster(right = "") {
 	//Takes the stored selectedFrame and selectedMask to add the frame w/ mask to the card master!
 	if (selectedFrame > -1 && selectedMask != "") {
 		//In order to both keep input values and insert new frames before old ones, they must be added like so:
-		cardMaster.insertBefore(frameList[selectedFrame].cardMasterElement(selectedMask + right), cardMaster.children[0]);
+		cardMaster.insertBefore(frameList[selectedFrame].cardMasterElement(selectedMask + right), cardMaster.children[newFrameInsertionLocation]);
 		cardMasterUpdated();
 	}
 }
@@ -240,7 +241,14 @@ function cardMasterUpdated() {
 		if (parseInt(targetChild.id.replace("frameIndex", "")) == -1) {
 			//The card art placeholder is manually set to -1 and cannot be removed :)
             frameFinalContext.drawImage(cardArt, version.artX + getValue("inputCardArtX"), version.artY + getValue("inputCardArtY"), cardArt.width * getValue("inputCardArtZoom") / 100, cardArt.height * getValue("inputCardArtZoom") / 100);
-		} else {
+        } else if (parseInt(targetChild.id.replace("frameIndex", "")) == -2) {
+            if (i == 0) {
+                newFrameInsertionLocation = 1;
+            } else {
+                newFrameInsertionLocation = 0;
+            }
+            frameFinalContext.drawImage(textCanvas, 0, 0, cardWidth, cardHeight);
+        } else {
 			var frameToDraw = frameList[parseInt(targetChild.id.replace("frameIndex", ""))];
 			var opacityToDraw = targetChild.children[1].children[1].value / 100;
 			var maskName = targetChild.innerHTML.slice(targetChild.innerHTML.indexOf("(") + 1, targetChild.innerHTML.indexOf(")"));
@@ -292,7 +300,7 @@ function cardImageUpdated() {
     }
     cardFinalContext.drawImage(watermarkCanvas, 0, 0, cardWidth, cardHeight)
 	cardFinalContext.drawImage(bottomInfoCanvas, 0, 0, cardWidth, cardHeight);
-    cardFinalContext.drawImage(textCanvas, 0, 0, cardWidth, cardHeight);
+//    cardFinalContext.drawImage(textCanvas, 0, 0, cardWidth, cardHeight);
 	cardFinalContext.drawImage(setSymbolCanvas, 0, 0, cardWidth, cardHeight)
     cardFinalContext.drawManaCost(document.getElementById("inputManaCost").value, version.manaCostX, version.manaCostY, version.manaCostDiameter, version.manaCostDistance, version.manaCostDirection)
 	//Clear the corners
diff --git a/data/versions/m15.js b/data/versions/m15.js
index 9beff01b..0f94c2e0 100644
--- a/data/versions/m15.js
+++ b/data/versions/m15.js
@@ -23,7 +23,8 @@ version.manaCostDirection = "horizontal"
 version.watermarkWidth = scale(520)
 version.watermarkHeight = scale(250)
 version.watermarkY = scale(800)
-version.masksToAdd = ["Right Half", "Corners", "Full", "Title", "Type", "Rules Text", "Pinline", "Frame", "Border", "Legend", "Legend With Border", "Box Topper"]
+version.masksToAdd = ["Right Half", "Corners", "Full", "Title", "Type", "Rules Text", "Pinline", "Frame", "Border", "Legend", "Legend With Border", "Box Topper"];
+filterFramePicker("frameClassRegular");
 //Name, text, x, y, width, height, font, size, color, other
 version.textList = [
 	["Title", "", scale(64), scale(83), scale(630), 0, "belerenb", 37, "black", "oneLine=true"],
@@ -40,7 +41,7 @@ function m15BottomInfo() {
 	bottomInfoContext.writeText(document.getElementById("inputInfoSet").value + "  \u2022  " + document.getElementById("inputInfoLanguage").value + "  {font:belerenbsc}{artistBrush}{fontsize1}" + document.getElementById("inputInfoArtist").value, scale(46), scale(1000), scale(375), 0, "gothammedium", 17, "white", "oneLine=true")
 	var copyrightShift = 0;
 	for (var i = 0; i < cardMaster.children.length; i++) {
-		if (parseInt(cardMaster.children[i].id.replace("frameIndex", "")) != -1 && frameList[parseInt(cardMaster.children[i].id.replace("frameIndex", ""))].image.src.includes("PT") && !frameList[parseInt(cardMaster.children[i].id.replace("frameIndex", ""))].framePickerClasses.includes("frameClassCustom")) {
+		if (parseInt(cardMaster.children[i].id.replace("frameIndex", "")) >= 0 && frameList[parseInt(cardMaster.children[i].id.replace("frameIndex", ""))].image.src.includes("PT") && !frameList[parseInt(cardMaster.children[i].id.replace("frameIndex", ""))].framePickerClasses.includes("frameClassCustom")) {
 			copyrightShift = 19;
 		}
 	}
diff --git a/data/versions/m15extras.js b/data/versions/m15extras.js
index d9b4ccc6..c5437e1a 100644
--- a/data/versions/m15extras.js
+++ b/data/versions/m15extras.js
@@ -20,6 +20,7 @@ version.watermarkWidth = scale(520)
 version.watermarkHeight = scale(250)
 version.watermarkY = scale(800)
 version.masksToAdd = []
+filterFramePicker("frameClassRegular");
 //Name, text, x, y, width, height, font, size, color, other
 version.textList = [
     ["Title", "", scale(64), scale(83), scale(630), 0, "belerenb", 37, "black", "oneLine=true"],
diff --git a/data/versions/unhinged.js b/data/versions/unhinged.js
index 2e6b466d..fe2f4cc1 100644
--- a/data/versions/unhinged.js
+++ b/data/versions/unhinged.js
@@ -34,7 +34,7 @@ function unhingedBottomInfo() {
 	bottomInfoContext.writeText(document.getElementById("inputInfoSet").value + "  \u2022  " + document.getElementById("inputInfoLanguage").value + "  {font:belerenbsc}{artistBrush}{fontsize1}" + document.getElementById("inputInfoArtist").value, scale(46), scale(1000), scale(375), 0, "gothammedium", 17, "white", "oneLine=true")
 	var copyrightShift = 0;
 	for (var i = 0; i < cardMaster.children.length; i++) {
-		if (parseInt(cardMaster.children[i].id.replace("frameIndex", "")) != -1 && frameList[parseInt(cardMaster.children[i].id.replace("frameIndex", ""))].image.src.includes("PT")) {
+		if (parseInt(cardMaster.children[i].id.replace("frameIndex", "")) >= 1 && frameList[parseInt(cardMaster.children[i].id.replace("frameIndex", ""))].image.src.includes("PT")) {
 			copyrightShift = 19;
 		}
 	}
diff --git a/index.html b/index.html
index 72c104d4..d6c7a282 100644
--- a/index.html
+++ b/index.html
@@ -40,6 +40,7 @@
                         </div>
                         <div id="selectedFramePreview">No frame selected</div>
                         <div id="cardMaster">
+                            <div id="frameIndex-2" class="cardMasterElement"><span class="handle">|||</span><div>Text Placeholder</div><span></span></div>
                             <div id="frameIndex-1" class="cardMasterElement"><span class="handle">|||</span><div>Card Art Placeholder <img id="artPlaceholderImage"></div><span></span></div>
                         </div>
                         <div class="bar"></div>