diff --git a/index.html b/index.html
index e7d2a14..dfaff35 100644
--- a/index.html
+++ b/index.html
@@ -19,8 +19,10 @@
 
     <script>
       const game = {
-        width: document.getElementById('game-canvas').width,
-        height: document.getElementById('game-canvas').height,
+        canvas: {
+          width: document.getElementById('game-canvas').width,
+          height: document.getElementById('game-canvas').height,
+        }
       };
     </script>
 
diff --git a/package-lock.json b/package-lock.json
index 0a4e4d5..cab00cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,510 +1,8 @@
 {
   "name": "bigblueisyou",
   "version": "1.0.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "bigblueisyou",
-      "version": "1.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "express": "^4.17.3"
-      }
-    },
-    "node_modules/accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "dependencies": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
-    },
-    "node_modules/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
-      "dependencies": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.8.1",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.9.7",
-        "raw-body": "2.4.3",
-        "type-is": "~1.6.18"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-      "dependencies": {
-        "safe-buffer": "5.2.1"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
-    },
-    "node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
-    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-    },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
-    },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/express": {
-      "version": "4.17.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
-      "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
-      "dependencies": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.19.2",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.4.2",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
-        "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.9.7",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.17.2",
-        "serve-static": "1.14.2",
-        "setprototypeof": "1.2.0",
-        "statuses": "~1.5.0",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
-    },
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
-    },
-    "node_modules/proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "dependencies": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/raw-body": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
-      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
-      "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "1.8.1",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "node_modules/send": {
-      "version": "0.17.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
-      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "1.8.1",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "node_modules/serve-static": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
-      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
-      "dependencies": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.17.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-    },
-    "node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    }
-  },
   "dependencies": {
     "accepts": {
       "version": "1.3.8",
diff --git a/src/bootstrap.js b/src/bootstrap.js
index 657067c..fc06962 100644
--- a/src/bootstrap.js
+++ b/src/bootstrap.js
@@ -1,30 +1,32 @@
 game.bootstrap = (() => {
   const scripts = [
-    { src: ['src/render/graphics.js'], id: 'render' },
-    { src: ['src/components/component.js', 'src/components/position.js', 'src/components/appearence.js'], id: 'components' },
-    { src: ['src/entities/entity.js'],      id: 'entity' },
-    { src: ['src/entities/bigblue.js'],     id: 'entities' },
-    { src: ['src/entities/flag.js'],        id: 'entities' },
-    { src: ['src/entities/floor.js'],       id: 'entities' },
-    { src: ['src/entities/grass.js'],       id: 'entities' },
-    { src: ['src/entities/hedge.js'],       id: 'entities' },
-    { src: ['src/entities/liquid.js'],      id: 'entities' },
-    { src: ['src/entities/rock.js'],        id: 'entities' },
-    { src: ['src/entities/wall.js'],        id: 'entities' },
-    { src: ['src/entities/wordBigBlue.js'], id: 'entities' },
-    { src: ['src/entities/wordFlag.js'],    id: 'entities' },
-    { src: ['src/entities/wordIs.js'],      id: 'entities' },
-    { src: ['src/entities/wordKill.js'],    id: 'entities' },
-    { src: ['src/entities/wordLava.js'],    id: 'entities' },
-    { src: ['src/entities/wordPush.js'],    id: 'entities' },
-    { src: ['src/entities/wordRock.js'],    id: 'entities' },
-    { src: ['src/entities/wordSink.js'],    id: 'entities' },
-    { src: ['src/entities/wordStop.js'],    id: 'entities' },
-    { src: ['src/entities/wordWall.js'],    id: 'entities' },
-    { src: ['src/entities/wordWater.js'],   id: 'entities' },
-    { src: ['src/entities/wordWin.js'],     id: 'entities' },
-    { src: ['src/entities/wordYou.js'],     id: 'entities' },
-    { src: ['src/systems/render.js'], id: 'systems' },
+    { src: ['src/utils/objectEquivalence.js', 'src/utils/unitizeVector.js'], id: 'utils'},
+    { src: ['src/render/graphics.js'], id: 'graphics' },
+    { src: ['src/components/component.js'], id: 'component' },
+    { 
+      src: [
+        'src/components/position.js', 'src/components/momentum.js', 'src/components/gridPosition.js',
+        'src/components/appearence.js'
+      ],
+      id: 'components'
+    },
+    { src: ['src/entities/entity.js'], id: 'entity' },
+    { 
+      src: [
+        'src/entities/bigblue.js', 'src/entities/flag.js', 'src/entities/floor.js', 'src/entities/grass.js', 'src/entities/hedge.js',
+        'src/entities/liquid.js', 'src/entities/rock.js', 'src/entities/wall.js', 'src/entities/wordBigBlue.js', 
+        'src/entities/wordFlag.js', 'src/entities/wordIs.js', 'src/entities/wordKill.js', 'src/entities/wordLava.js',
+        'src/entities/wordPush.js', 'src/entities/wordRock.js', 'src/entities/wordSink.js', 'src/entities/wordStop.js', 
+        'src/entities/wordWall.js', 'src/entities/wordWater.js', 'src/entities/wordWin.js', 'src/entities/wordYou.js'
+      ],
+      id: 'entities'
+    },
+    { src: ['src/systems/system.js'], id: 'system' },
+    { 
+      src: [
+        'src/systems/render.js', 'src/systems/gridSystem.js', 'src/systems/physics.js'
+      ],
+      id: 'systems' },
     { src: ['src/game.js'], id: 'game' },
   ];
   const assets = {};
diff --git a/src/components/gridPosition.js b/src/components/gridPosition.js
new file mode 100644
index 0000000..ede4b23
--- /dev/null
+++ b/src/components/gridPosition.js
@@ -0,0 +1 @@
+game.components.GridPosition = ({x, y}) => game.Component('gridPosition', {x, y});
\ No newline at end of file
diff --git a/src/components/momentum.js b/src/components/momentum.js
new file mode 100644
index 0000000..b974aa7
--- /dev/null
+++ b/src/components/momentum.js
@@ -0,0 +1 @@
+game.components.Momentum = ({dx, dy}) => game.Component('momentum', {dx, dy});
\ No newline at end of file
diff --git a/src/entities/entity.js b/src/entities/entity.js
index 33d1031..1eb5223 100644
--- a/src/entities/entity.js
+++ b/src/entities/entity.js
@@ -5,13 +5,14 @@ game.Entity = (id=game.nextId++) => {
 
   const addComponent = (component) => {
     components[component.name] = component;
-  }
-  const removeComponent = (component) => {
-    delete components[component.name];
-  }
-  const hasComponent = (component) => {
-    components[component.name] !== undefined;
-  }
+  };
+  const hasComponent = (componentName) => components[componentName] !== undefined;
+  const removeComponent = (componentName) => {
+    if (hasComponent(componentName)) {
+      delete components[componentName];
+    }
+  };
+  
 
   return {
     id,
diff --git a/src/game.js b/src/game.js
index cd82cc0..9cf60c6 100644
--- a/src/game.js
+++ b/src/game.js
@@ -1,20 +1,41 @@
-game.loop = (elapsedTime) => {
-  game.systems.Render.update(elapsedTime);
+let lastTimeStamp;
+game.loop = (timeStamp) => {
+  let elapsedTime = timeStamp - lastTimeStamp;
+  lastTimeStamp = timeStamp;
+
+  game.systemOrder.map((i) => {
+    game.systems[i].update(elapsedTime, game.entities);
+  });
 
   requestAnimationFrame(game.loop);
 }
 
 game.initialize = () => {
+  game.systemOrder = ["render", "physics", "gridSystem"];
+  game.systems = {
+    render: game.system.Render(game.graphics),
+    physics: game.system.Physics(),
+    gridSystem: game.system.GridSystem({
+      xDim: 15,
+      yDim: 15,
+      canvasWidth: game.canvas.width,
+      canvasHeight: game.canvas.height,
+    }),
+  };
+
   game.entities = {};
-  game.bigBlue = game.createBigBlue();
-  game.entities[game.bigBlue.id] = game.bigBlue;
-  game.bigBlue2 = game.createBigBlue();
-  game.bigBlue2.components.position = game.components.Position({x: 200, y: 100});
-  game.entities[game.bigBlue2.id] = game.bigBlue2;
+
+  Array(400).fill(null).forEach((_, i) => {
+    const bigBlue = game.createBigBlue();
+    bigBlue.addComponent(game.components.GridPosition({x: Math.floor(Math.random() * 15), y: Math.floor(Math.random() * 13)}));
+    game.entities[bigBlue.id] = bigBlue;
+  });
 
   game.rock = game.createRock();
-  game.rock.components.position = game.components.Position({x: 200, y: 200});
+  game.rock.addComponent(game.components.Position({x: 200, y: 200}));
+  game.rock.addComponent(game.components.GridPosition({x: 0, y: 0}));
   game.entities[game.rock.id] = game.rock;
 
+  lastTimeStamp = performance.now()
   requestAnimationFrame(game.loop);
 }
diff --git a/src/render/graphics.js b/src/render/graphics.js
index de98633..6a199f0 100644
--- a/src/render/graphics.js
+++ b/src/render/graphics.js
@@ -3,10 +3,9 @@ game.graphics = (
   (context) => {
     context.imageSmoothingEnabled = false;
     const clear = () => {
-      context.clearRect(0, 0, game.width, game.height);
+      context.clearRect(0, 0, game.canvas.width, game.canvas.height);
     };
     
-    // Maybe this should be a component?
     const Sprite = ({image, spriteX, spriteY, spriteWidth, spriteHeight, timePerFrame, cols, rows, numFrames, drawFunction}) => {
       timePerFrame = timePerFrame ?? 100;
       numFrames = numFrames ?? 1;
diff --git a/src/systems/gridSystem.js b/src/systems/gridSystem.js
new file mode 100644
index 0000000..05ce17e
--- /dev/null
+++ b/src/systems/gridSystem.js
@@ -0,0 +1,73 @@
+game.system.GridSystem = ({ xDim, yDim, canvasWidth, canvasHeight }) => {
+  const entitiesGrid = Array(yDim).fill(null).map(() => Array(xDim).fill(null).map(() => new Map()));
+
+  const gridWidth = canvasWidth / xDim;
+  const gridHeight = canvasHeight / yDim;
+
+  const gameCoordsToGrid = ({ x, y }) => {
+    return { x: Math.floor((x+gridWidth/2) / canvasWidth * xDim), y: Math.floor((y+gridHeight/2) / canvasHeight * yDim) };
+  };
+
+  const gridCoordsToGame = ({ x, y }) => {
+    return { x: x * gridWidth, y: y * gridHeight };
+  };
+
+  const rebuildGrid = (entities) => {
+    let changedIds = new Set();
+    entities.map(entity => {
+      const { x, y } = entity.components.gridPosition;
+      if (!entitiesGrid[y][x].has(entity.id)) {
+        changedIds.add(entity.id);
+      }
+    });
+    entitiesGrid.forEach((row) => row.forEach((entitiesInCell) => {
+      for (let id of entitiesInCell.keys()) {
+        if (changedIds.has(id)) {
+          entitiesInCell.delete(id);
+        }
+      }
+    }));
+    changedIds.forEach(id => {
+      const entity = entities[id];
+      const { x, y } = entity.components.gridPosition;
+      entitiesGrid[y][x].set(entity.id, entity);
+    });
+  }
+
+  const update = (_elapsedTime, entities) => {
+    const gridEntities = Object.keys(entities).filter((x) => entities[x].hasComponent("gridPosition")).map((x) => entities[x]);
+    rebuildGrid(gridEntities);
+    gridEntities.map((entity) => {
+      if (entity.hasComponent("appearance")) {
+        entity.components.appearance.width = canvasWidth / xDim;
+        entity.components.appearance.height = canvasHeight / yDim;
+      }
+      if (entity.hasComponent("position")) {
+        const newGridCoords = gameCoordsToGrid(entity.components.position);
+        const oldGridCoords = entity.components.gridPosition;
+        if (!equivalence(newGridCoords, oldGridCoords)) {
+          const momentumVector = unitize({ 
+            dx: newGridCoords.x - oldGridCoords.x,
+            dy: newGridCoords.y - oldGridCoords.y,
+          });
+
+          // TODO: Loop in momentum direction until we find an entity that does not have "push" component
+          entity.components.gridPosition.x = entity.components.gridPosition.x + momentumVector.dx;
+          entity.components.gridPosition.y = entity.components.gridPosition.y + momentumVector.dy;
+
+          entity.components.position = {
+            ...entity.components.position,
+            ...gridCoordsToGame(entity.components.gridPosition)
+          };
+
+          if (entity.hasComponent("momentum")) {
+            entity.components.momentum.dx = 0;
+            entity.components.momentum.dy = 0;
+          }
+        }
+      }
+    });
+  };
+
+  return { entitiesGrid, gameCoordsToGrid, gridCoordsToGame, update, gridWidth, gridHeight };
+};
\ No newline at end of file
diff --git a/src/systems/physics.js b/src/systems/physics.js
new file mode 100644
index 0000000..c9b6cf7
--- /dev/null
+++ b/src/systems/physics.js
@@ -0,0 +1,13 @@
+game.system.Physics = () => {
+  const update = (elapsedTime) => {
+    for (let id in game.entities) {
+      const entity = game.entities[id];
+      if (entity.hasComponent("momentum")) {
+        const {dx, dy} = entity.components.momentum;
+        entity.components.position.x += dx * elapsedTime;
+        entity.components.position.y += dy * elapsedTime;
+      }
+    }
+  }
+  return { update };
+}
\ No newline at end of file
diff --git a/src/systems/render.js b/src/systems/render.js
index c8eff4b..0a4c72d 100644
--- a/src/systems/render.js
+++ b/src/systems/render.js
@@ -1,18 +1,13 @@
-game.systems = {};
-game.systems.Render = ((graphics) => {
-  const renderEntities = (elapsedTime, entities) => {
+game.system.Render = (graphics) => {
+  const update = (elapsedTime, entities) => {
+    graphics.clear();
+
     for (let id in entities) {
       const entity = entities[id];
-      if (entity.sprite && entity.components.position && entity.components.appearance) {
-//        document.getElementById("game-canvas").getContext("2d").drawImage(game.assets.bigblue, 100, 100, 100, 100);
+      if (entity.sprite && entity.hasComponent("position") && entity.hasComponent("appearance")) {
         entity.sprite.draw(elapsedTime, {...entity.components.position, ...entity.components.appearance});
       }
     }
   }
-
-  const update = (elapsedTime) => {
-    graphics.clear();
-    renderEntities(elapsedTime, game.entities);
-  }
   return { update };
-})(game.graphics);
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/systems/system.js b/src/systems/system.js
new file mode 100644
index 0000000..f331401
--- /dev/null
+++ b/src/systems/system.js
@@ -0,0 +1 @@
+game.system = {};
\ No newline at end of file
diff --git a/src/utils/objectEquivalence.js b/src/utils/objectEquivalence.js
new file mode 100644
index 0000000..e33dd76
--- /dev/null
+++ b/src/utils/objectEquivalence.js
@@ -0,0 +1,14 @@
+const equivalence = (obj1, obj2) => {
+  if (obj1 === null) {
+    return obj1 === null;
+  }
+  return Object.keys(obj1).every(key => {
+    if (obj2[key] === undefined) {
+      return false;
+    }
+    if (typeof obj1[key] === 'object') {
+      return equivalence(obj1[key], obj2[key]);
+    }
+    return obj1[key] === obj2[key];
+  });
+};
diff --git a/src/utils/unitizeVector.js b/src/utils/unitizeVector.js
new file mode 100644
index 0000000..6297ca8
--- /dev/null
+++ b/src/utils/unitizeVector.js
@@ -0,0 +1,11 @@
+const unitize = (vector) => {
+  // Not *technically* a unit vector, but has x,y components of |magnitude| = 1
+  Object.keys(vector).forEach((key) => {
+    if (typeof vector[key] === 'object') {
+      vector[key] = vector[key].unitize();
+    } else if (typeof vector[key] === 'number') {
+      vector[key] = (vector[key] === 0 ? 0 : vector[key] / Math.abs(vector[key]));
+    }
+  });
+  return vector;
+}
\ No newline at end of file