diff --git a/nmigen/humpback.py b/nmigen/humpback.py
index 70a5c18..5072b7b 100644
--- a/nmigen/humpback.py
+++ b/nmigen/humpback.py
@@ -9,7 +9,6 @@ from nmigen.build import *
 from nmigen.vendor.lattice_ice40 import *
 from nmigen_boards.resources import *
 from resources import *
-from pin_mapper import *
 
 
 __all__ = ["HumpbackPlatform"]
@@ -18,10 +17,8 @@ __all__ = ["HumpbackPlatform"]
 class HumpbackPlatform(LatticeICE40Platform):
 	device = "iCE40HX8K"		# Using ICE40HX8K-CT256
 	package = "CT256"
-	default_clk = "clk25"		# Point of deviation: Clock speed for humpback is fixed at 25MHz
+	default_clk = "clk25"
 
-	# Acquire GPIO mappings from gpio_mapper
-	gpio_dict, global_gpio_dict = GPIOMapping()
 	resources = [
 
 		# Define clock
@@ -34,12 +31,7 @@ class HumpbackPlatform(LatticeICE40Platform):
 			Attrs(IO_STANDARD="SB_LVCMOS")
 		),
 
-		# Serial interfaces: Only including pins usable to STM32
-
 		# Define UART interfaces
-		# UART interface: There are no pull ups from humpback.
-		#		  Need to configure STM32 pins to pull up.
-		# Note: Use USART in asynchronous mode
 		UARTResource(0,
 			rx="T11", tx="M13", rts="M15", cts="T10",
 			attrs=Attrs(IO_STANDARD="SB_LVCMOS", PULLUP=1)
@@ -62,33 +54,136 @@ class HumpbackPlatform(LatticeICE40Platform):
 		),
 
 		# Define I2C interface
-		# Note: Need to program pull up in stm32
 		#	Use "role=device" to make humpback a I2C slave
 		I2CResource(0,
 			sda="T16", scl="M12",
 			attrs=Attrs(IO_STANDARD="SB_LVCMOS", PULLUP=1)
 		),
-
-
-		# TODO:STM32 GPIO pins, ignore other unusable pins as well
-		*GPIOResources(
-			pins_dict = gpio_dict, dir = "o",
-			attrs=Attrs(IO_STANDARD="SB_LVCMOS"),
-		),
-		*GPIOResources(
-			pins_dict = global_gpio_dict, dir = "o",
-			attrs=Attrs(GLOBAL=True, IO_STANDARD="SB_LVCMOS"),
-		),
-
 	]
 
-	connectors = []
+	# Using the dict approach in (o)migen
+	# Note: Numbering is required in nMigen, so some probably meaningful strings/integers are inserted
+	connectors = [
+
+		# EEM0 Connection Interface
+		Connector("eem", 0, {
+			"d0_cc_n": "H1",
+			"d0_cc_p": "J3",
+            "d1_n"	: "B1",
+            "d1_p"	: "F5",
+            "d2_n"	: "C2",
+            "d2_p"	: "C1",
+            "d3_n"	: "D2",
+            "d3_p"	: "F4",
+            "d4_n"	: "D1",
+            "d4_p"	: "G5",
+            "d5_n"	: "E3",
+            "d5_p"	: "G4",
+            "d6_n"	: "E2",
+            "d6_p"	: "H5",
+            "d7_n"	: "F3",
+            "d7_p"	: "G3",
+		}),
+		# EEM1 Connection Interface
+		Connector("eem", 1,
+			"d0_cc_n": "L3",
+			"d0_cc_p": "L6",
+			"d1_n": "F1",
+			"d1_p": "H6",
+			"d2_n": "G2",
+			"d2_p": "H4",
+			"d3_n": "H2",
+			"d3_p": "J4",
+			"d4_n": "J1",
+			"d4_p": "J2",
+			"d5_n": "K3",
+			"d5_p": "K1",
+			"d6_n": "L1",
+			"d6_p": "L4",
+			"d7_n": "M1",
+			"d7_p": "K4",
+		}),
+
+		# EEM2 Connection Interface
+		Connector("eem", 2,
+	        "d0_cc_n": "G1",
+			"d0_cc_p": "J5",
+			"d1_n": "M2",
+			"d1_p": "K5",
+			"d2_n": "N2",
+			"d2_p": "L7",
+			"d3_n": "M3",
+			"d3_p": "M6",
+			"d4_n": "N3",
+			"d4_p": "L5",
+			"d5_n": "M4",
+			"d5_p": "P1",
+			"d6_n": "M5",
+			"d6_p": "P2",
+			"d7_n": "N4",
+			"d7_p": "R1",
+		}),
+
+		# STM32 Connection Pins
+		Connector("stm32", "GPIO",  {
+	        "PA0": "A2",
+            "PA1": "P14",
+            "PA2": "B8",
+	        "PA3": "L13",
+		    "PA7": "N12",
+		    "PA8": "M9",
+		    "PA9": "P10",
+		    "PA10": "R10",
+		    "PA15": "B14",
+
+		    "PB0": "A1",
+		    "PB1": "G12",
+		    "PB2": "B6",
+		    "PB6": "A7",
+		    "PB10": "C3",
+		    "PB11": "F7",
+		    "PB12": "B13",
+		    "PB13": "B12",
+		    "PB15": "A11",
+
+			"PC0": "L14",
+			"PC1": "M14",
+			"PC2": "A9",
+			"PC3": "M16",
+			"PC4": "N16",
+			"PC5": "P16",
+			"PC6": "B10",
+			"PC7": "B15",
+			"PC8": "H16",
+			"PC9": "J10",
+			"PC10": "J16",
+			"PC11": "J15",
+			"PC12": "K12",
+
+			"PD0": "T9",
+			"PD1": "N9",
+			"PD2": "K13",
+			"PD7": "L12",
+			"PD11": "E5",
+			"PD12": "D5",
+			"PD13": "C5",
+
+	        "PF7": "L9",
+			"PF8": "L10",
+			"PF9": "P9",
+			"PF14": "B9",
+
+			"PG0": "M7",
+			"PG1": "P8",
+			"PG2": "K14",
+			"PG3": "K15",
+		}),
+	]
 
 	# tool chain setup, using default ICE40 HX8K evaluation code
 	def toolchain_program(self, products, name):
 		iceprog = os.environ.get("ICEPROG", "iceprog")
 		with products.extract("{}.bin".format(name)) as bitstream_filename:
-           	# TODO: this should be factored out and made customizable
 			subprocess.check_call([iceprog, "-S", bitstream_filename])
 
 if __name__ == "__main__":
@@ -96,17 +191,3 @@ if __name__ == "__main__":
    	HumpbackPlatform().build(Blinky(), do_program=False)
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-