diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/painting_table.json b/src/main/resources/assets/overdrive_that_matters/models/block/painting_table.json
new file mode 100644
index 000000000..eda781060
--- /dev/null
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/painting_table.json
@@ -0,0 +1,233 @@
+{
+	"credit": "Made with Blockbench",
+	"render_type": "cutout",
+	"texture_size": [64, 32],
+	"textures": {
+		"0": "overdrive_that_matters:block/painting_table",
+		"particle": "overdrive_that_matters:block/painting_table"
+	},
+	"elements": [
+		{
+			"name": "body",
+			"from": [0, 8, 0],
+			"to": [16, 10, 16],
+			"faces": {
+				"north": {"uv": [0, 11, 4, 12], "texture": "#0"},
+				"east": {"uv": [8, 3, 4, 4], "texture": "#0"},
+				"south": {"uv": [12, 11, 16, 12], "texture": "#0"},
+				"west": {"uv": [4, 3, 8, 4], "texture": "#0"},
+				"up": {"uv": [0, 0, 4, 8], "texture": "#0"},
+				"down": {"uv": [0, 0, 4, 8], "texture": "#0"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [0, 0, 0],
+			"to": [16, 2, 15],
+			"faces": {
+				"north": {"uv": [0, 15, 4, 16], "texture": "#0"},
+				"east": {"uv": [7.75, 7, 4, 8], "texture": "#0"},
+				"south": {"uv": [12, 15, 16, 16], "texture": "#0"},
+				"west": {"uv": [4, 7, 7.75, 8], "texture": "#0"},
+				"up": {"uv": [0, 0, 4, 7.5], "texture": "#0"},
+				"down": {"uv": [0, 0, 4, 7.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [0, 2, 5],
+			"to": [16, 8, 15],
+			"faces": {
+				"north": {"uv": [0, 12, 4, 15], "texture": "#0"},
+				"east": {"uv": [7.75, 4, 5.25, 7], "texture": "#0"},
+				"south": {"uv": [12, 12, 16, 15], "texture": "#0"},
+				"west": {"uv": [5.25, 4, 7.75, 7], "texture": "#0"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [0, 10, 9],
+			"to": [16, 16, 16],
+			"faces": {
+				"north": {"uv": [4, 11.5, 8, 14.5], "texture": "#0"},
+				"east": {"uv": [7.75, 0, 6, 3], "texture": "#0"},
+				"south": {"uv": [12, 8, 16, 11], "texture": "#0"},
+				"west": {"uv": [6, 0, 7.75, 3], "texture": "#0"},
+				"up": {"uv": [4, 8, 8, 11.5], "rotation": 180, "texture": "#0"}
+			}
+		},
+		{
+			"name": "cartridge",
+			"from": [10, 2, 1],
+			"to": [12, 8, 5],
+			"faces": {
+				"north": {"uv": [8.75, 0, 9.25, 3], "texture": "#0"},
+				"east": {"uv": [7.75, 0, 8.75, 3], "texture": "#0"},
+				"west": {"uv": [8.75, 0, 7.75, 3], "texture": "#0"}
+			}
+		},
+		{
+			"name": "cartridge",
+			"from": [7, 2, 1],
+			"to": [9, 8, 5],
+			"faces": {
+				"north": {"uv": [11.75, 0, 12.25, 3], "texture": "#0"},
+				"east": {"uv": [10.75, 0, 11.75, 3], "texture": "#0"},
+				"west": {"uv": [11.75, 0, 10.75, 3], "texture": "#0"}
+			}
+		},
+		{
+			"name": "cartridge",
+			"from": [13, 2, 1],
+			"to": [15, 8, 5],
+			"faces": {
+				"north": {"uv": [10.25, 0, 10.75, 3], "texture": "#0"},
+				"east": {"uv": [9.25, 0, 10.25, 3], "texture": "#0"},
+				"west": {"uv": [10.25, 0, 9.25, 3], "texture": "#0"}
+			}
+		},
+		{
+			"name": "screenframe",
+			"from": [1.5, 7.3, 1],
+			"to": [5.5, 11.3, 2],
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [3.5, 14, 0.5]},
+			"faces": {
+				"east": {"uv": [5, 0, 6, 0.5], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [5, 0.5, 6, 2.5], "texture": "#0"},
+				"west": {"uv": [5, 0, 6, 0.5], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [5, 0, 6, 0.5], "texture": "#0"},
+				"down": {"uv": [5, 0, 6, 0.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "screen",
+			"from": [1.5, 7.3, 1],
+			"to": [5.5, 11.3, 1],
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [3.5, 14, 0.5]},
+			"faces": {
+				"north": {"uv": [4, 0, 5, 2], "texture": "#0"}
+			},
+		  "forge_data": {
+			"block_light": 15
+		  }
+		},
+		{
+			"from": [1, 2, 1],
+			"to": [6, 8, 5],
+			"faces": {
+				"north": {"uv": [9, 7, 10.25, 10], "texture": "#0"},
+				"east": {"uv": [8, 7, 9, 10], "texture": "#0"},
+				"west": {"uv": [10.25, 7, 11.25, 10], "texture": "#0"}
+			}
+		},
+		{
+			"name": "arm",
+			"from": [11, 11.5, 7.5],
+			"to": [12, 18.5, 9.5],
+			"rotation": {"angle": -45, "axis": "x", "origin": [11.5, 14, 8.5]},
+			"faces": {
+				"north": {"uv": [0, 9.5, 1.75, 10], "rotation": 270, "texture": "#0"},
+				"east": {"uv": [0, 10, 1.75, 11], "rotation": 270, "texture": "#0"},
+				"south": {"uv": [0, 9.5, 1.75, 10], "rotation": 270, "texture": "#0"},
+				"west": {"uv": [0, 11, 1.75, 10], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "arm",
+			"from": [10.5, 12.54537, 5.01779],
+			"to": [12.5, 18.54537, 8.01779],
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [11.5, 18.27582, 6.35928]},
+			"faces": {
+				"north": {"uv": [2.5, 8, 4, 9], "rotation": 270, "texture": "#0"},
+				"east": {"uv": [2.5, 9, 4, 10.5], "rotation": 270, "texture": "#0"},
+				"south": {"uv": [2.5, 8, 4, 9], "rotation": 270, "texture": "#0"},
+				"west": {"uv": [2.5, 9, 4, 10.5], "rotation": 270, "texture": "#0"},
+				"up": {"uv": [2, 9.5, 2.5, 11], "texture": "#0"},
+				"down": {"uv": [2, 8, 2.5, 9.5], "rotation": 180, "texture": "#0"}
+			}
+		},
+		{
+			"name": "baseplate",
+			"from": [1, 9.5, 1],
+			"to": [15, 10.5, 8],
+			"faces": {
+				"north": {"uv": [8, 6.5, 11.5, 7], "texture": "#0"},
+				"east": {"uv": [8, 6.5, 9.75, 7], "texture": "#0"},
+				"south": {"uv": [8, 6.5, 11.5, 7], "texture": "#0"},
+				"west": {"uv": [9.75, 6.5, 11.5, 7], "texture": "#0"},
+				"up": {"uv": [8, 3, 11.5, 6.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "support",
+			"from": [1, 0, 15],
+			"to": [5, 8, 16],
+			"faces": {
+				"east": {"uv": [13.25, 0, 13.5, 4], "texture": "#0"},
+				"south": {"uv": [12.25, 0, 13.25, 4], "texture": "#0"},
+				"west": {"uv": [13.25, 0, 13.5, 4], "texture": "#0"},
+				"down": {"uv": [12.25, 4, 13.25, 4.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "support",
+			"from": [11, 0, 15],
+			"to": [15, 8, 16],
+			"faces": {
+				"east": {"uv": [13.25, 0, 13.5, 4], "texture": "#0"},
+				"south": {"uv": [12.25, 0, 13.25, 4], "texture": "#0"},
+				"west": {"uv": [13.25, 0, 13.5, 4], "texture": "#0"},
+				"down": {"uv": [12.25, 4, 13.25, 4.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "mesh",
+			"from": [0, 10, 0],
+			"to": [0, 13, 9],
+			"faces": {
+				"east": {"uv": [0, 8, 2, 9.5], "texture": "#0"},
+				"west": {"uv": [2, 8, 0, 9.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "mesh",
+			"from": [16, 10, 0],
+			"to": [16, 13, 9],
+			"faces": {
+				"east": {"uv": [0, 8, 2, 9.5], "texture": "#0"},
+				"west": {"uv": [2, 8, 0, 9.5], "texture": "#0"}
+			}
+		}
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [75, 45, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.375, 0.375, 0.375]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [75, 45, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.375, 0.375, 0.375]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, 45, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, 225, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
+		},
+		"gui": {
+			"rotation": [30, 225, 0],
+			"scale": [0.625, 0.625, 0.625]
+		},
+		"fixed": {
+			"scale": [0.5, 0.5, 0.5]
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/water_source.json b/src/main/resources/assets/overdrive_that_matters/models/block/water_source.json
new file mode 100644
index 000000000..3daef1784
--- /dev/null
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/water_source.json
@@ -0,0 +1,164 @@
+{
+	"credit": "Made with Blockbench",
+	"render_type": "cutout",
+	"texture_size": [32, 32],
+	"textures": {
+		"0": "overdrive_that_matters:block/water_source_misc",
+		"1": "overdrive_that_matters:block/water_source",
+		"2": "overdrive_that_matters:block/water_source_pump",
+		"particle": "overdrive_that_matters:block/water_source"
+	},
+	"elements": [
+		{
+			"name": "body",
+			"from": [10, 0, 0],
+			"to": [16, 16, 9],
+			"faces": {
+				"north": {"uv": [0, 0, 3, 8], "texture": "#1"},
+				"east": {"uv": [12.5, 8, 8, 16], "texture": "#1"},
+				"south": {"uv": [13, 0, 16, 8], "texture": "#0"},
+				"west": {"uv": [8, 0, 12.5, 8], "texture": "#1"},
+				"up": {"uv": [0, 8, 3, 12.5], "rotation": 180, "texture": "#1"},
+				"down": {"uv": [0, 9, 3, 13.5], "rotation": 180, "texture": "#1"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [0, 10, 0],
+			"to": [10, 16, 9],
+			"faces": {
+				"north": {"uv": [3, 0, 8, 3], "texture": "#1"},
+				"south": {"uv": [8, 0, 13, 3], "texture": "#0"},
+				"west": {"uv": [8, 0, 12.5, 3], "texture": "#1"},
+				"up": {"uv": [3, 8, 8, 12.5], "rotation": 180, "texture": "#1"},
+				"down": {"uv": [8, 8, 3, 12.5], "texture": "#1"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [0, 0, 0],
+			"to": [10, 6, 9],
+			"faces": {
+				"north": {"uv": [3, 5, 8, 8], "texture": "#1"},
+				"south": {"uv": [8, 5, 13, 8], "texture": "#0"},
+				"west": {"uv": [8, 5, 12.5, 8], "texture": "#1"},
+				"up": {"uv": [3, 8, 8, 12.5], "rotation": 180, "texture": "#1"},
+				"down": {"uv": [3, 9, 8, 13.5], "rotation": 180, "texture": "#1"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [0, 6, 5],
+			"to": [10, 10, 9],
+			"faces": {
+				"north": {"uv": [3, 3, 8, 5], "texture": "#1"},
+				"south": {"uv": [8, 3, 13, 5], "texture": "#0"},
+				"west": {"uv": [10.5, 3, 12.5, 5], "texture": "#1"}
+			}
+		},
+		{
+			"name": "pump",
+			"from": [9, 1, 9],
+			"to": [15, 14, 15],
+			"faces": {
+				"east": {"uv": [0, 0, 3, 6.5], "texture": "#0"},
+				"south": {"uv": [6, 0, 12, 13], "texture": "#2"},
+				"west": {"uv": [0, 0, 3, 6.5], "texture": "#0"},
+				"up": {"uv": [3, 0, 6, 3], "texture": "#0"},
+				"down": {"uv": [3, 0, 6, 3], "texture": "#0"}
+			}
+		},
+		{
+			"name": "pump",
+			"from": [1, 1, 9],
+			"to": [7, 14, 15],
+			"faces": {
+				"east": {"uv": [0, 0, 3, 6.5], "texture": "#0"},
+				"south": {"uv": [0, 0, 6, 13], "texture": "#2"},
+				"west": {"uv": [0, 0, 3, 6.5], "texture": "#0"},
+				"up": {"uv": [3, 0, 6, 3], "texture": "#0"},
+				"down": {"uv": [3, 0, 6, 3], "texture": "#0"}
+			}
+		},
+		{
+			"name": "pump",
+			"from": [2, 14, 10],
+			"to": [14, 15, 14],
+			"faces": {
+				"north": {"uv": [0, 13.5, 6, 14], "texture": "#1"},
+				"east": {"uv": [6, 14, 6.5, 16], "rotation": 90, "texture": "#1"},
+				"south": {"uv": [0, 13.5, 6, 14], "texture": "#1"},
+				"west": {"uv": [6, 14, 6.5, 16], "rotation": 90, "texture": "#1"},
+				"up": {"uv": [0, 14, 6, 16], "texture": "#1"},
+				"down": {"uv": [0, 14, 6, 16], "texture": "#1"}
+			}
+		},
+		{
+			"name": "mesh",
+			"from": [0, 0, 9],
+			"to": [16, 16, 16],
+			"faces": {
+				"east": {"uv": [8, 8, 4.5, 16], "texture": "#0"},
+				"south": {"uv": [8, 8, 16, 16], "texture": "#0"},
+				"west": {"uv": [4.5, 8, 8, 16], "texture": "#0"},
+				"up": {"uv": [0, 8, 3.5, 16], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [0, 8, 3.5, 16], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"name": "mesh",
+			"from": [0, 16, 9],
+			"to": [16, 0, 16],
+			"faces": {
+				"east": {"uv": [8, 8, 4.5, 16], "texture": "#0"},
+				"south": {"uv": [8, 8, 16, 16], "texture": "#0"},
+				"west": {"uv": [4.5, 8, 8, 16], "texture": "#0"},
+				"up": {"uv": [0, 8, 3.5, 16], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [0, 8, 3.5, 16], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [1, 6, 1],
+			"to": [10, 10, 5],
+			"faces": {
+				"north": {"uv": [3, 3, 7.5, 5], "texture": "#1"},
+				"west": {"uv": [8.5, 3, 10.5, 5], "texture": "#1"}
+			}
+		}
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [75, 45, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.375, 0.375, 0.375]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [75, 45, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.375, 0.375, 0.375]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, 45, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, 225, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
+		},
+		"gui": {
+			"rotation": [30, 225, 0],
+			"scale": [0.625, 0.625, 0.625]
+		},
+		"head": {
+			"rotation": [0, 180, 0]
+		},
+		"fixed": {
+			"scale": [0.5, 0.5, 0.5]
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/painting_table.png b/src/main/resources/assets/overdrive_that_matters/textures/block/painting_table.png
new file mode 100644
index 000000000..e5c6dc2ee
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/painting_table.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/water_source.png b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source.png
new file mode 100644
index 000000000..d1737a8fd
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_mask.png b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_mask.png
new file mode 100644
index 000000000..f1effd65a
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_mask.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_misc.png b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_misc.png
new file mode 100644
index 000000000..4c55238ef
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_misc.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png
new file mode 100644
index 000000000..d78517297
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png.mcmeta b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png.mcmeta
new file mode 100644
index 000000000..d0da1eb25
--- /dev/null
+++ b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png.mcmeta
@@ -0,0 +1,6 @@
+{
+	"animation": {
+		"frametime": 2,
+		"interpolate": true
+	}
+}
\ No newline at end of file