diff --git a/Infinity-2d20/Heat Token.png b/Infinity-2d20/Heat Token.png
new file mode 100644
index 0000000000..bbde9d80c1
Binary files /dev/null and b/Infinity-2d20/Heat Token.png differ
diff --git a/Infinity-2d20/Infinity 2d20.css b/Infinity-2d20/Infinity 2d20.css
index 2725ee28f2..a1b799d9b5 100644
--- a/Infinity-2d20/Infinity 2d20.css	
+++ b/Infinity-2d20/Infinity 2d20.css	
@@ -329,8 +329,9 @@ div.section {
 	input#type-tab3:checked ~ div#type-Geist,
 	input#type-tab4:checked ~ div#type-Shell,
 	input#type-tab5:checked ~ div#type-Vehicle,
-	input#type-tab-legacy:checked ~ div#type-Legacy {
-		display: block;
+	input#type-tab-legacy:checked ~ div#type-Legacy,
+	input#type-tab-group:checked ~ div#type-Group {
+		display: inherit;
 	}
 
 	/* Displays all tabs when the "all" button is selected. */
@@ -1007,6 +1008,27 @@ div.section {
 
 /* #endregion: SHEUT TAB */
 
+/* #region: GROUP TAB */
+
+	#type-Group .grid {
+		display: grid;
+		grid-template-columns: 1fr 1fr;
+		justify-items: center;
+		margin-top: 25px;
+	}
+
+	#type-Group input {
+		width: 100%;
+	}
+
+	#type-Group .grid > div > div {
+		background: white;
+		border: solid #70c4db;
+		border-width: 0px 2px 2px 2px;
+	}
+
+/* #endregion: GROUP TAB */
+
 /* === Legacy selectors === */
 
 table.NPC {
diff --git a/Infinity-2d20/Infinity 2d20.html b/Infinity-2d20/Infinity 2d20.html
index 8e036e2f1a..7b2d1dfe68 100644
--- a/Infinity-2d20/Infinity 2d20.html	
+++ b/Infinity-2d20/Infinity 2d20.html	
@@ -3,7 +3,8 @@
 <input id="type-tab3" type="radio" name="attr_type_tab" class="type-tab" value="3" /><label for="type-tab3">Geist</label>
 <input id="type-tab4" type="radio" name="attr_type_tab" class="type-tab" value="4" /><label for="type-tab4">Shell</label>
 <input id="type-tab5" type="radio" name="attr_type_tab" class="type-tab" value="5" /><label for="type-tab5">Vehc.</label>
-<input id="type-tab-legacy" type="radio"  name="attr_type_tab" value="6"><label for="type-tab-legacy">Legacy</label>
+<input id="type-tab-group" type="radio" name="attr_type_tab" class="type-tab" value="6" /><label for="type-tab-group">Group</label>
+<input id="type-tab-legacy" type="radio"  name="attr_type_tab" value="7"><label for="type-tab-legacy">Legacy</label>
 <div id="type-PC">
 	<input id="tab1" type="radio" name="attr_tab" value="1" checked="checked"/><label for="tab1">MAIN</label>
 	<input id="tab2" type="radio" name="attr_tab" value="2"/><label for="tab2">TALENTS</label>
@@ -2136,6 +2137,18 @@
 		</div>
 	</div>
 </div>
+<div id="type-Group">
+	<div class="grid">
+		<div>
+			<h3>Momentum</h3>
+			<div><input type="number" id="group-momentum" name="attr_group_momentum"></div>
+		</div>
+		<div>
+			<h3>Heat</h3>
+			<div><input type="number" id="group-heat" name="attr_group_heat"></div>
+		</div>
+	</div>
+</div>
 <div id="type-Legacy" class="type-legacy">
 	<div class="legacy-section-basic legacy-section">
 		<img class="legacy-logo" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Infinity-2d20/Infinityheader.png"
diff --git a/Infinity-2d20/Momentum Token.png b/Infinity-2d20/Momentum Token.png
new file mode 100644
index 0000000000..1d8bc54c1e
Binary files /dev/null and b/Infinity-2d20/Momentum Token.png differ