diff --git a/assembler.js b/assembler.js
index d46cd08..58c3f3c 100644
--- a/assembler.js
+++ b/assembler.js
@@ -2,9 +2,7 @@ const { logMemory, num2hex } = require('./logging.js');
 const {
   INITIAL_IP_ADDRESS,
   DISPLAY_ADDR,
-  KEYPAD_ADDR,
   POINTER_TO_DISPLAY,
-  POINTER_TO_KEYPAD
 } = require('./machine.config.js');
 
 // 1 = verbose
@@ -190,7 +188,6 @@ function decodeInstructions(source) {
 
   // Initialize memory-mapped IO -- TODO this should probably be in the CPU, not here
   machineCode[POINTER_TO_DISPLAY] = DISPLAY_ADDR;
-  machineCode[POINTER_TO_KEYPAD]  = KEYPAD_ADDR;
 
   // Initialize arrays that collect code references that
   // have to be revisited after our first pass through the source
diff --git a/machine.config.js b/machine.config.js
index dd73423..e8e56e5 100644
--- a/machine.config.js
+++ b/machine.config.js
@@ -1,12 +1,11 @@
 module.exports = {
-  "INITIAL_IP_ADDRESS":  48,
+  "INITIAL_IP_ADDRESS":  29,
 
   // Use these in CPU:
   "DISPLAY_ADDR": 0,
-  "KEYPAD_ADDR": 32,
-  // Store the `X_ADDR`s at these addresses when assembling:
-  "POINTER_TO_DISPLAY": 33,
-  "POINTER_TO_KEYPAD": 34,
+  "KEYPAD_ADDR": 27,
+  // Store the `DISPLAY_ADDR` at this address when assembling:
+  "POINTER_TO_DISPLAY": 26,
 
   "KEY_MAP": {
     // Same layout as COSMAC VIP / CHIP-8