diff --git a/package-lock.json b/package-lock.json
index 4529adc..fa948bc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,17 +6,29 @@
     "": {
       "name": "cljs-2048",
       "dependencies": {
-        "highlight.js": "11.5.1",
         "react": "17.0.2",
         "react-dom": "17.0.2"
       },
       "devDependencies": {
+        "highlight.js": "^11.5.1",
         "karma": "6.4.0",
         "karma-chrome-launcher": "3.1.1",
         "karma-cljs-test": "0.1.0",
         "karma-junit-reporter": "2.0.1",
-        "shadow-cljs": "2.20.5",
-        "tailwindcss": "^3.2.2"
+        "shadow-cljs": "^2.24.1",
+        "tailwindcss": "^3.3.2"
+      }
+    },
+    "node_modules/@alloc/quick-lru": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
+      "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/@colors/colors": {
@@ -28,6 +40,60 @@
         "node": ">=0.1.90"
       }
     },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.18",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
+      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
+      }
+    },
+    "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "dev": true
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -100,38 +166,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-node": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
-      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.0.0",
-        "acorn-walk": "^7.0.0",
-        "xtend": "^4.0.2"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -156,6 +190,12 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
+      "dev": true
+    },
     "node_modules/anymatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
@@ -527,6 +567,15 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/commander": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -698,15 +747,6 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/defined": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
-      "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -736,23 +776,6 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/detective": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz",
-      "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==",
-      "dev": true,
-      "dependencies": {
-        "acorn-node": "^1.8.2",
-        "defined": "^1.0.0",
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "detective": "bin/detective.js"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
@@ -1235,9 +1258,10 @@
       }
     },
     "node_modules/highlight.js": {
-      "version": "11.5.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.5.1.tgz",
-      "integrity": "sha512-LKzHqnxr4CrD2YsNoIf/o5nJ09j4yi/GcH5BnYz9UnVpZdS4ucMgvP61TDty5xJcFGRjnH4DpujkS9bHT3hq0Q==",
+      "version": "11.9.0",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.9.0.tgz",
+      "integrity": "sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==",
+      "dev": true,
       "engines": {
         "node": ">=12.0.0"
       }
@@ -1359,9 +1383,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -1433,6 +1457,15 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
+    "node_modules/jiti": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.19.1.tgz",
+      "integrity": "sha512-oVhqoRDaBXf7sjkll95LHVS6Myyyb1zaunVwk4Z0+WPSW4gjS0pl01zYKHScTuyEhQsFxV5L4DR5r+YqSyqyyg==",
+      "dev": true,
+      "bin": {
+        "jiti": "bin/jiti.js"
+      }
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -1517,14 +1550,20 @@
       }
     },
     "node_modules/lilconfig": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz",
-      "integrity": "sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
       "dev": true,
       "engines": {
         "node": ">=10"
       }
     },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
@@ -1726,11 +1765,28 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
+    "node_modules/mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dev": true,
+      "dependencies": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
     "node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -1932,10 +1988,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/pirates": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/postcss": {
-      "version": "8.4.18",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
-      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
+      "version": "8.4.25",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.25.tgz",
+      "integrity": "sha512-7taJ/8t2av0Z+sQEvNzCkpDynl0tX3uJMCODi6nT3PfASC7dYCWV9aQ+uiCf+KBD4SEFcu+GvJdGdwzQ6OSjCw==",
       "dev": true,
       "funding": [
         {
@@ -1945,10 +2010,14 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
       "dependencies": {
-        "nanoid": "^3.3.4",
+        "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       },
@@ -1957,9 +2026,9 @@
       }
     },
     "node_modules/postcss-import": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.1.0.tgz",
-      "integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==",
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
+      "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
       "dev": true,
       "dependencies": {
         "postcss-value-parser": "^4.0.0",
@@ -1967,16 +2036,16 @@
         "resolve": "^1.1.7"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=14.0.0"
       },
       "peerDependencies": {
         "postcss": "^8.0.0"
       }
     },
     "node_modules/postcss-js": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz",
-      "integrity": "sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
+      "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
       "dev": true,
       "dependencies": {
         "camelcase-css": "^2.0.1"
@@ -1989,20 +2058,20 @@
         "url": "https://opencollective.com/postcss/"
       },
       "peerDependencies": {
-        "postcss": "^8.3.3"
+        "postcss": "^8.4.21"
       }
     },
     "node_modules/postcss-load-config": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
-      "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz",
+      "integrity": "sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==",
       "dev": true,
       "dependencies": {
         "lilconfig": "^2.0.5",
-        "yaml": "^1.10.2"
+        "yaml": "^2.1.1"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">= 14"
       },
       "funding": {
         "type": "opencollective",
@@ -2022,12 +2091,12 @@
       }
     },
     "node_modules/postcss-nested": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.0.tgz",
-      "integrity": "sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz",
+      "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==",
       "dev": true,
       "dependencies": {
-        "postcss-selector-parser": "^6.0.10"
+        "postcss-selector-parser": "^6.0.11"
       },
       "engines": {
         "node": ">=12.0"
@@ -2041,9 +2110,9 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
       "dev": true,
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -2163,18 +2232,6 @@
         }
       ]
     },
-    "node_modules/quick-lru": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -2319,12 +2376,12 @@
       "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "version": "1.22.2",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
       "dev": true,
       "dependencies": {
-        "is-core-module": "^2.9.0",
+        "is-core-module": "^2.11.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -2460,14 +2517,14 @@
       }
     },
     "node_modules/shadow-cljs": {
-      "version": "2.20.5",
-      "resolved": "https://registry.npmjs.org/shadow-cljs/-/shadow-cljs-2.20.5.tgz",
-      "integrity": "sha512-RtnjjfNYqA3ZwkNFCmXb443dN+OV4WOXuMI4XPz4YhKL4NdApvzQLYwpdtrBaSYmjXm/vFXN8+GjFo3QVdwuoA==",
+      "version": "2.24.1",
+      "resolved": "https://registry.npmjs.org/shadow-cljs/-/shadow-cljs-2.24.1.tgz",
+      "integrity": "sha512-5nwrgl1jMmIThQego02yigOXJAHWPhh+0H1sT98uo26PGbYG3Oz0lXMsOXyLp+/USpzMNsgKFUNKrCK3wJP1Gg==",
       "dev": true,
       "dependencies": {
         "node-libs-browser": "^2.2.1",
         "readline-sync": "^1.4.7",
-        "shadow-cljs-jar": "1.3.2",
+        "shadow-cljs-jar": "1.3.4",
         "source-map-support": "^0.4.15",
         "which": "^1.3.1",
         "ws": "^7.4.6"
@@ -2480,9 +2537,9 @@
       }
     },
     "node_modules/shadow-cljs-jar": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/shadow-cljs-jar/-/shadow-cljs-jar-1.3.2.tgz",
-      "integrity": "sha512-XmeffAZHv8z7451kzeq9oKh8fh278Ak+UIOGGrapyqrFBB773xN8vMQ3O7J7TYLnb9BUwcqadKkmgaq7q6fhZg==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/shadow-cljs-jar/-/shadow-cljs-jar-1.3.4.tgz",
+      "integrity": "sha512-cZB2pzVXBnhpJ6PQdsjO+j/MksR28mv4QD/hP/2y1fsIa9Z9RutYgh3N34FZ8Ktl4puAXaIGlct+gMCJ5BmwmA==",
       "dev": true
     },
     "node_modules/side-channel": {
@@ -2721,6 +2778,48 @@
         "node": ">=8"
       }
     },
+    "node_modules/sucrase": {
+      "version": "3.32.0",
+      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz",
+      "integrity": "sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "commander": "^4.0.0",
+        "glob": "7.1.6",
+        "lines-and-columns": "^1.1.6",
+        "mz": "^2.7.0",
+        "pirates": "^4.0.1",
+        "ts-interface-checker": "^0.1.9"
+      },
+      "bin": {
+        "sucrase": "bin/sucrase",
+        "sucrase-node": "bin/sucrase-node"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sucrase/node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
@@ -2734,44 +2833,41 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.2.tgz",
-      "integrity": "sha512-c2GtSdqg+harR4QeoTmex0Ngfg8IIHNeLQH5yr2B9uZbZR1Xt1rYbjWOWTcj3YLTZhrmZnPowoQDbSRFyZHQ5Q==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz",
+      "integrity": "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==",
       "dev": true,
       "dependencies": {
+        "@alloc/quick-lru": "^5.2.0",
         "arg": "^5.0.2",
         "chokidar": "^3.5.3",
-        "color-name": "^1.1.4",
-        "detective": "^5.2.1",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
         "fast-glob": "^3.2.12",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
-        "lilconfig": "^2.0.6",
+        "jiti": "^1.18.2",
+        "lilconfig": "^2.1.0",
         "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
         "object-hash": "^3.0.0",
         "picocolors": "^1.0.0",
-        "postcss": "^8.4.18",
-        "postcss-import": "^14.1.0",
-        "postcss-js": "^4.0.0",
-        "postcss-load-config": "^3.1.4",
-        "postcss-nested": "6.0.0",
-        "postcss-selector-parser": "^6.0.10",
+        "postcss": "^8.4.23",
+        "postcss-import": "^15.1.0",
+        "postcss-js": "^4.0.1",
+        "postcss-load-config": "^4.0.1",
+        "postcss-nested": "^6.0.1",
+        "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0",
-        "quick-lru": "^5.1.1",
-        "resolve": "^1.22.1"
+        "resolve": "^1.22.2",
+        "sucrase": "^3.32.0"
       },
       "bin": {
         "tailwind": "lib/cli.js",
         "tailwindcss": "lib/cli.js"
       },
       "engines": {
-        "node": ">=12.13.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.0.9"
+        "node": ">=14.0.0"
       }
     },
     "node_modules/tailwindcss/node_modules/glob-parent": {
@@ -2786,6 +2882,27 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dev": true,
+      "dependencies": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "node_modules/thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+      "dev": true,
+      "dependencies": {
+        "thenify": ">= 3.1.0 < 4"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/timers-browserify": {
       "version": "2.0.12",
       "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
@@ -2837,6 +2954,12 @@
         "node": ">=0.6"
       }
     },
+    "node_modules/ts-interface-checker": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
+      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
+      "dev": true
+    },
     "node_modules/tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -3047,12 +3170,12 @@
       }
     },
     "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
+      "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
       "dev": true,
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14"
       }
     },
     "node_modules/yargs": {
@@ -3084,12 +3207,65 @@
     }
   },
   "dependencies": {
+    "@alloc/quick-lru": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
+      "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
+      "dev": true
+    },
     "@colors/colors": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
       "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
       "dev": true
     },
+    "@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "@jridgewell/resolve-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "dev": true
+    },
+    "@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "dev": true
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.18",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
+      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
+      },
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": {
+          "version": "1.4.14",
+          "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+          "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+          "dev": true
+        }
+      }
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3150,29 +3326,6 @@
         "negotiator": "0.6.3"
       }
     },
-    "acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true
-    },
-    "acorn-node": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
-      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
-      "dev": true,
-      "requires": {
-        "acorn": "^7.0.0",
-        "acorn-walk": "^7.0.0",
-        "xtend": "^4.0.2"
-      }
-    },
-    "acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-      "dev": true
-    },
     "ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -3188,6 +3341,12 @@
         "color-convert": "^2.0.1"
       }
     },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
+      "dev": true
+    },
     "anymatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
@@ -3509,6 +3668,12 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "commander": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+      "dev": true
+    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -3658,12 +3823,6 @@
         "ms": "2.0.0"
       }
     },
-    "defined": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
-      "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
-      "dev": true
-    },
     "depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -3686,17 +3845,6 @@
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true
     },
-    "detective": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz",
-      "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==",
-      "dev": true,
-      "requires": {
-        "acorn-node": "^1.8.2",
-        "defined": "^1.0.0",
-        "minimist": "^1.2.6"
-      }
-    },
     "di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
@@ -4082,9 +4230,10 @@
       }
     },
     "highlight.js": {
-      "version": "11.5.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.5.1.tgz",
-      "integrity": "sha512-LKzHqnxr4CrD2YsNoIf/o5nJ09j4yi/GcH5BnYz9UnVpZdS4ucMgvP61TDty5xJcFGRjnH4DpujkS9bHT3hq0Q=="
+      "version": "11.9.0",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.9.0.tgz",
+      "integrity": "sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==",
+      "dev": true
     },
     "hmac-drbg": {
       "version": "1.0.1",
@@ -4176,9 +4325,9 @@
       }
     },
     "is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"
@@ -4229,6 +4378,12 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
+    "jiti": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.19.1.tgz",
+      "integrity": "sha512-oVhqoRDaBXf7sjkll95LHVS6Myyyb1zaunVwk4Z0+WPSW4gjS0pl01zYKHScTuyEhQsFxV5L4DR5r+YqSyqyyg==",
+      "dev": true
+    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -4301,9 +4456,15 @@
       }
     },
     "lilconfig": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz",
-      "integrity": "sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
+      "dev": true
+    },
+    "lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
     "lodash": {
@@ -4464,10 +4625,21 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
+    "mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dev": true,
+      "requires": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
     "nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
       "dev": true
     },
     "negotiator": {
@@ -4628,21 +4800,27 @@
       "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
       "dev": true
     },
+    "pirates": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "dev": true
+    },
     "postcss": {
-      "version": "8.4.18",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
-      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
+      "version": "8.4.25",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.25.tgz",
+      "integrity": "sha512-7taJ/8t2av0Z+sQEvNzCkpDynl0tX3uJMCODi6nT3PfASC7dYCWV9aQ+uiCf+KBD4SEFcu+GvJdGdwzQ6OSjCw==",
       "dev": true,
       "requires": {
-        "nanoid": "^3.3.4",
+        "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       }
     },
     "postcss-import": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.1.0.tgz",
-      "integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==",
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
+      "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
       "dev": true,
       "requires": {
         "postcss-value-parser": "^4.0.0",
@@ -4651,37 +4829,37 @@
       }
     },
     "postcss-js": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz",
-      "integrity": "sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
+      "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
       "dev": true,
       "requires": {
         "camelcase-css": "^2.0.1"
       }
     },
     "postcss-load-config": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
-      "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz",
+      "integrity": "sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==",
       "dev": true,
       "requires": {
         "lilconfig": "^2.0.5",
-        "yaml": "^1.10.2"
+        "yaml": "^2.1.1"
       }
     },
     "postcss-nested": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.0.tgz",
-      "integrity": "sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz",
+      "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==",
       "dev": true,
       "requires": {
-        "postcss-selector-parser": "^6.0.10"
+        "postcss-selector-parser": "^6.0.11"
       }
     },
     "postcss-selector-parser": {
-      "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
       "dev": true,
       "requires": {
         "cssesc": "^3.0.0",
@@ -4767,12 +4945,6 @@
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true
     },
-    "quick-lru": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-      "dev": true
-    },
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -4898,12 +5070,12 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "version": "1.22.2",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
       "dev": true,
       "requires": {
-        "is-core-module": "^2.9.0",
+        "is-core-module": "^2.11.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       }
@@ -4992,23 +5164,23 @@
       }
     },
     "shadow-cljs": {
-      "version": "2.20.5",
-      "resolved": "https://registry.npmjs.org/shadow-cljs/-/shadow-cljs-2.20.5.tgz",
-      "integrity": "sha512-RtnjjfNYqA3ZwkNFCmXb443dN+OV4WOXuMI4XPz4YhKL4NdApvzQLYwpdtrBaSYmjXm/vFXN8+GjFo3QVdwuoA==",
+      "version": "2.24.1",
+      "resolved": "https://registry.npmjs.org/shadow-cljs/-/shadow-cljs-2.24.1.tgz",
+      "integrity": "sha512-5nwrgl1jMmIThQego02yigOXJAHWPhh+0H1sT98uo26PGbYG3Oz0lXMsOXyLp+/USpzMNsgKFUNKrCK3wJP1Gg==",
       "dev": true,
       "requires": {
         "node-libs-browser": "^2.2.1",
         "readline-sync": "^1.4.7",
-        "shadow-cljs-jar": "1.3.2",
+        "shadow-cljs-jar": "1.3.4",
         "source-map-support": "^0.4.15",
         "which": "^1.3.1",
         "ws": "^7.4.6"
       }
     },
     "shadow-cljs-jar": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/shadow-cljs-jar/-/shadow-cljs-jar-1.3.2.tgz",
-      "integrity": "sha512-XmeffAZHv8z7451kzeq9oKh8fh278Ak+UIOGGrapyqrFBB773xN8vMQ3O7J7TYLnb9BUwcqadKkmgaq7q6fhZg==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/shadow-cljs-jar/-/shadow-cljs-jar-1.3.4.tgz",
+      "integrity": "sha512-cZB2pzVXBnhpJ6PQdsjO+j/MksR28mv4QD/hP/2y1fsIa9Z9RutYgh3N34FZ8Ktl4puAXaIGlct+gMCJ5BmwmA==",
       "dev": true
     },
     "side-channel": {
@@ -5201,6 +5373,37 @@
         "ansi-regex": "^5.0.1"
       }
     },
+    "sucrase": {
+      "version": "3.32.0",
+      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz",
+      "integrity": "sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "commander": "^4.0.0",
+        "glob": "7.1.6",
+        "lines-and-columns": "^1.1.6",
+        "mz": "^2.7.0",
+        "pirates": "^4.0.1",
+        "ts-interface-checker": "^0.1.9"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
+      }
+    },
     "supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
@@ -5208,34 +5411,34 @@
       "dev": true
     },
     "tailwindcss": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.2.tgz",
-      "integrity": "sha512-c2GtSdqg+harR4QeoTmex0Ngfg8IIHNeLQH5yr2B9uZbZR1Xt1rYbjWOWTcj3YLTZhrmZnPowoQDbSRFyZHQ5Q==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz",
+      "integrity": "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==",
       "dev": true,
       "requires": {
+        "@alloc/quick-lru": "^5.2.0",
         "arg": "^5.0.2",
         "chokidar": "^3.5.3",
-        "color-name": "^1.1.4",
-        "detective": "^5.2.1",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
         "fast-glob": "^3.2.12",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
-        "lilconfig": "^2.0.6",
+        "jiti": "^1.18.2",
+        "lilconfig": "^2.1.0",
         "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
         "object-hash": "^3.0.0",
         "picocolors": "^1.0.0",
-        "postcss": "^8.4.18",
-        "postcss-import": "^14.1.0",
-        "postcss-js": "^4.0.0",
-        "postcss-load-config": "^3.1.4",
-        "postcss-nested": "6.0.0",
-        "postcss-selector-parser": "^6.0.10",
+        "postcss": "^8.4.23",
+        "postcss-import": "^15.1.0",
+        "postcss-js": "^4.0.1",
+        "postcss-load-config": "^4.0.1",
+        "postcss-nested": "^6.0.1",
+        "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0",
-        "quick-lru": "^5.1.1",
-        "resolve": "^1.22.1"
+        "resolve": "^1.22.2",
+        "sucrase": "^3.32.0"
       },
       "dependencies": {
         "glob-parent": {
@@ -5249,6 +5452,24 @@
         }
       }
     },
+    "thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dev": true,
+      "requires": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+      "dev": true,
+      "requires": {
+        "thenify": ">= 3.1.0 < 4"
+      }
+    },
     "timers-browserify": {
       "version": "2.0.12",
       "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
@@ -5288,6 +5509,12 @@
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true
     },
+    "ts-interface-checker": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
+      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
+      "dev": true
+    },
     "tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -5439,9 +5666,9 @@
       "dev": true
     },
     "yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
+      "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
       "dev": true
     },
     "yargs": {
diff --git a/package.json b/package.json
index c97f5db..1952467 100644
--- a/package.json
+++ b/package.json
@@ -9,16 +9,16 @@
     "ci": "npx shadow-cljs compile karma-test && npx karma start --single-run --reporters junit,dots"
   },
   "dependencies": {
-    "highlight.js": "11.5.1",
     "react": "17.0.2",
     "react-dom": "17.0.2"
   },
   "devDependencies": {
     "karma": "6.4.0",
+    "highlight.js": "^11.5.1",
     "karma-chrome-launcher": "3.1.1",
     "karma-cljs-test": "0.1.0",
     "karma-junit-reporter": "2.0.1",
-    "shadow-cljs": "2.20.5",
-    "tailwindcss": "^3.2.2"
+    "shadow-cljs": "^2.24.1",
+    "tailwindcss": "^3.3.2"
   }
 }
diff --git a/resources/public/index.html b/resources/public/index.html
index 96548ef..22fe1f0 100644
--- a/resources/public/index.html
+++ b/resources/public/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset='utf-8'>
     <meta name="viewport" content="width=device-width,initial-scale=1">
-    <title>2048 - game implementation using ClojureScript</title>
+    <title>2048 - ClojureScript</title>
   </head>
   <body>
     <noscript>
diff --git a/src/cljs_2048/board.cljs b/src/cljs_2048/board.cljs
index 54b6ec2..ff44a45 100644
--- a/src/cljs_2048/board.cljs
+++ b/src/cljs_2048/board.cljs
@@ -8,16 +8,16 @@
 (def random-fill #(rand-nth [2 2 2 4])) ;; Favor 2 for random filling
 
 (def initial-board
-  [[0 0 0 0]
-   [0 0 0 0]
-   [0 0 0 0]
-   [0 0 0 0]])
+  [[[0] [0] [0] [0]]
+   [[0] [0] [0] [0]]
+   [[0] [0] [0] [0]]
+   [[0] [0] [0] [0]]])
 
 (defn set-tile
   "Set value at given row and column of the board"
-  [board r c value]
+  [board r c value state]
   (let [row (nth board r)
-        updated (assoc row c value)]
+        updated (assoc row c [value state])]
     (assoc board r updated)))
 
 (defn get-tile
@@ -28,19 +28,19 @@
       (nth c)))
 
 (defn empty-tiles
-  "Returns list of [r c] where r is row and c is column index of tile with zero"
+  "Returns list of [r c] where r is row and c is column index of tile with [0]"
   [board]
   (for [r     (range rows-count)
         c     (range columns-count)
-        :when (zero? (get-tile board r c))]
+        :when (= [0] (get-tile board r c))]
     [r c]))
 
 (defn random-tile
-  "Set 2 or 4 to random empty position of tile"
+  "Set 2 or 4 to random empty positions of tile"
   [board]
   (if-let [tiles (seq (empty-tiles board))]
     (let [[r c] (rand-nth tiles)]
-      (set-tile board r c (random-fill)))
+      (set-tile board r c (random-fill) :random))
     board))
 
 (defn with-two-random-tiles
@@ -66,30 +66,44 @@
 
 (defn fill-zeroes
   "If vector v's length is less than n, fill the remaining slots with 0.
-   Otherwise returns the v. Default fill-count is columns-count."
-  ([v]
-   (fill-zeroes v columns-count))
-  ([v n]
+   Otherwise returns the v."
+  [v n]
    (let [fill-count (- n (count v))]
-     (into v (repeat fill-count 0)))))
+     (into (vec v) (repeat fill-count [0]))))
 
 (defn combine
-  "Combines two equal tiles into one in the v and fills remaining with zeroes"
+  "Combines two equal tiles into one in the vector v and fills remaining with zeroes.
+  v is a vector of vectors of single integer, for example [[2 :random] [0] [4 :merged] [4]]
+  [0] means empty slot and all [0] should be trailing in the result.
+  Add state as :merged when combining two tiles
+  (combine [[2 :random] [0] [4 :merged] [4]]) ;; => [[2] [8 :merged] [0] [0]]
+  "
   [v]
-  (loop [[head & remaining] v
-         acc                []]
-    (cond
-      (empty? remaining)
-      (fill-zeroes (conj acc (if head head 0))) ;; head can be nil
-
-      (= head (first remaining))
-      (let [sum (* 2 head)]
-        (when (pos? sum)
-          (re-frame/dispatch [::game-events/add-score sum]))
-        (recur (rest remaining) (conj acc sum)))
-
-      :else
-      (recur remaining (conj acc head)))))
+  (let [non-zero-v (remove zero? (map first v)) ;; Remove 0 tiles before reduction, work with value not state
+        merged     (reduce (fn [[acc prev] current]
+                              (cond
+                                ;; If previous is nil, set current as previous
+                                (nil? prev)
+                                [acc current]
+
+                                ;; If equal, merge and add to accumulator, set nil as previous
+                                (= prev current)
+                                (let [sum (+ prev current)]
+                                  (re-frame/dispatch [::game-events/add-score sum])
+                                  [(conj acc [sum :merged]) nil])
+
+                                ;; If not equal, add previous to accumulator and current element as previous
+                                :else
+                                [(conj acc [prev]) current]))
+
+                            [[] nil] ;; Start with empty accumulator and nil previous
+                            non-zero-v) ;; Reduce over non-zero tiles.
+        ;; If last tile is not merged, add it to result
+        result       (first merged)
+        last         (second merged)
+        final-result (if last (conj result [last]) result)]
+
+        (fill-zeroes final-result columns-count)))
 
 (defn reverse-board
   "Reverse the board"
@@ -99,8 +113,8 @@
 (defn move-tiles-left
   "Move the tiles to left in v, by shifting value to empty tile"
   [v]
-  (-> (filterv pos? v)
-      (fill-zeroes)))
+  (-> (filterv #(pos? (first %)) v)
+      (fill-zeroes columns-count)))
 
 (defn stack-left
   [board]
diff --git a/src/cljs_2048/game.cljs b/src/cljs_2048/game.cljs
index 92059d8..3166e3b 100644
--- a/src/cljs_2048/game.cljs
+++ b/src/cljs_2048/game.cljs
@@ -4,9 +4,15 @@
 
 (defn can-move-sideways?
   [v]
-  (->> (partition-by identity v)
-       (map count)
-       (some #(> % 1))))
+  (or
+   ;; if there is a zero, then we can move
+   (some #(= [0] %) v)
+
+   ;; if there are two consecutive equal values, then we can move
+   (->> (map first v) ;; get the value
+        (partition-by identity)
+        (map count)
+        (some #(> % 1)))))
 
 (defn can-move?
   [board]
diff --git a/src/cljs_2048/game_events.cljs b/src/cljs_2048/game_events.cljs
index 8096776..b833a59 100644
--- a/src/cljs_2048/game_events.cljs
+++ b/src/cljs_2048/game_events.cljs
@@ -1,22 +1,25 @@
 (ns cljs-2048.game-events
   (:require
-   [day8.re-frame.tracing :refer-macros [fn-traced]]
    [re-frame.core :as re-frame]
    [cljs-2048.local-storage :as ls]))
 
-(re-frame/reg-event-db
- ::add-score
- (fn-traced
+(defn add-score
   [db [_ new-score]]
   (let [score      (+ new-score (:score db))
         high-score (max score (:high-score db))]
     (ls/set-high-score! high-score) ;; set high-score in local-storage
     (assoc db
            :score score
-           :high-score high-score))))
+           :high-score high-score)))
+
+(defn gameover
+  [db [_]]
+  (assoc db :gameover true))
+
+(re-frame/reg-event-db
+ ::add-score
+ add-score)
 
 (re-frame/reg-event-db
  ::gameover
- (fn-traced
-  [db [_]]
-  (assoc db :gameover true)))
+ gameover)
diff --git a/src/cljs_2048/gameover.cljs b/src/cljs_2048/gameover.cljs
deleted file mode 100644
index 9aae368..0000000
--- a/src/cljs_2048/gameover.cljs
+++ /dev/null
@@ -1,17 +0,0 @@
-(ns cljs-2048.gameover
-  (:require
-   [cljs-2048.events :as events]
-   [re-frame.core :as re-frame]))
-
-(def view
-  [:div {:class "relative flex justify-center items-center z-20"}
-   [:div {:class "w-full h-full bg-gray-900 bg-opacity-80 top-0 fixed sticky-0"}
-    [:div {:class "2xl:container  2xl:mx-auto py-48 px-4 md:px-28 flex justify-center items-center"}
-     [:div {:class "w-96 md:w-auto dark:bg-gray-800 relative flex flex-col justify-center items-center bg-white py-16 px-4 md:px-24 xl:py-24 xl:px-36"}
-      [:div {:class "mt-12"}
-       [:h1 {:role "main" :class "text-3xl dark:text-white lg:text-4xl font-semibold text-center text-gray-800"} "Game Over!!!"]]
-      [:div {:class "mt"}
-       [:p {:class "mt-6 sm:w-80 text-base dark:text-white text-center text-gray-800"} "What an amazing attempt, well done!"]]
-
-      [:button.btn-primary {:on-click #(re-frame/dispatch [::events/start-game])} "New Game"]
-      ]]]])
diff --git a/src/cljs_2048/views.cljs b/src/cljs_2048/views.cljs
index c845cdc..e0da28e 100644
--- a/src/cljs_2048/views.cljs
+++ b/src/cljs_2048/views.cljs
@@ -1,7 +1,6 @@
 (ns cljs-2048.views
   (:require
    [cljs-2048.events :as events]
-   [cljs-2048.gameover :as gameover]
    [cljs-2048.subs :as subs]
    [re-frame.core :as re-frame]
    [re-pressed.core :as rp]))
@@ -28,9 +27,17 @@
 
 ;; Displaying the game tile
 (defn tile-panel
-  [index value]
-  ^{:key index}
-  [:div {:class (str "tile tile-" value)}
+  [row-index col-index [value state]]
+  ^{:key col-index}
+   [:div {:class (str "tile tile-" value " tile-position-" (inc row-index) "-" (inc col-index)
+                      (cond
+                        (= state :merged)
+                        " tile-merged"
+
+                        (= state :random)
+                        " tile-new"
+
+                        :else ""))}
    (if (zero? value) "" value)])
 
 ;; Panel used to show Score and Best score
@@ -51,32 +58,44 @@
   (let [board (re-frame/subscribe [::subs/board])] ;; Get the current state of the board
     [:div.board
      ;; [:pre (with-out-str (cljs.pprint/pprint @board))] ;; print the board in page for debugging
-     (map ;; Each row of the board
-      (fn [value]
-        [:div.row
-         (map-indexed ;; Each tile of the row
-          tile-panel
-          value)])
-      @board)
+     (map-indexed
+      (fn [row-index row] ;; Each row of the board
+            ^{:key row-index}
+            [:div.row
+             (map-indexed (fn [col-index cell]
+                            (tile-panel row-index col-index cell))
+                          row)]);; Each tile of the row
+          @board)
      [:br.clear]]))
 
-(defn gameover-panel []
-  [:div gameover/view])
-
 (defn score
   []
   (let [score (re-frame/subscribe [::subs/score])
         high-score (re-frame/subscribe [::subs/high-score])]
-    [:div.flex.flex-row-reverse
+    [:div {:class "flex flex-row-reverse"}
      (score-panel ::high-score @high-score)
      (score-panel ::score @score)]))
 
+(defn gameover-panel []
+  [:div {:class "relative flex justify-center items-center z-20"}
+   [:div {:class "w-full h-full bg-gray-900 bg-opacity-60 top-0 fixed sticky-0"}
+    [:div {:class "2xl:container  2xl:mx-auto py-48 px-4 md:px-28 flex justify-center items-center"}
+     [:div {:class "w-96 md:w-auto relative flex flex-col justify-center items-center bg-white bg-opacity-60 py-16 px-4 md:px-24 xl:py-24 xl:px-36"}
+      [:div
+       [:h1 {:role "main" :class "text-3xl dark:text-white lg:text-4xl font-semibold text-center text-gray-800"}
+        "Game Over!"]]
+
+      (score)
+
+      [:div {:class "flex flex-col justify-center items-center"}
+       [:button.btn-primary {:on-click #(re-frame/dispatch [::events/start-game])} "New Game"]]]]]])
+
 (defn game-panel
   []
   (let [gameover (re-frame/subscribe [::subs/gameover])]
-    [:div.flex.flex-col.items-center
+    [:div {:class "flex flex-col items-center"}
      (when @gameover (gameover-panel))
-     [:button.btn-primary.bg-blue-200 {:on-click #(re-frame/dispatch [::events/start-game])} "New Game"]
+     [:button.btn-primary {:on-click #(re-frame/dispatch [::events/start-game])} "New Game"]
      [board-panel]]))
 
 (defn header
@@ -86,7 +105,8 @@
 (defn main-panel
   []
   (let [name (re-frame/subscribe [::subs/name])]
-    [:div.container.mx-auto.center
+    [:div {:class "relative flex min-h-screen flex-col justify-center overflow-hidden bg-gray-50 py-6 sm:py-12"}
+     [:div {:class "container mx-auto"}
      (header @name)
-     [score]
+     [score]]
      [game-panel]]))
diff --git a/src/style.css b/src/style.css
index b7c02ae..ac58f7a 100644
--- a/src/style.css
+++ b/src/style.css
@@ -4,35 +4,129 @@
 
 @layer components {
   .header {
-    @apply text-2xl font-bold leading-7 text-gray-900 sm:truncate sm:text-3xl sm:tracking-tight;
+    @apply text-4xl font-bold text-blue-900 leading-8 sm:truncate sm:text-3xl sm:tracking-tight;
   }
 
   .board {
-    @apply grid grid-rows-4 grid-flow-col gap-2 bg-zinc-500 rounded-lg place-content-center p-4;
+    @apply grid grid-flow-row gap-2 bg-zinc-500 p-2;
   }
 
   .row {
-    @apply grid grid-cols-4 gap-2 rounded-lg shadow-lg;
+    @apply grid grid-flow-col gap-2 sm:gap-2;
   }
 
   .score {
-      @apply z-10 p-2 m-2 w-48 rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none;
+    @apply z-10 p-2 m-2 w-48 rounded-md bg-white shadow-md ring-1 ring-black ring-opacity-5 focus:outline-none;
   }
 
   .score-high {
-      @apply bg-gray-200;
+    @apply bg-gray-200;
   }
 
   .btn-primary {
-      @apply p-2 m-2 w-48 dark:text-blue-800 dark:hover:bg-blue-100 dark:bg-white sm:w-auto text-base text-center text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-800 bg-blue-800 hover:bg-black;
+    @apply text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 me-2 mb-2 dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800;
   }
 
   .tile {
-    @apply text-black font-mono font-bold text-lg
-      transition duration-200 ease-in-out
-      box-border h-28 w-28 p-2 border-2
-      text-center
-      rounded-md shadow-md;
+    @apply sm:w-14 sm:h-14 md:w-28 md:h-28 flex items-center justify-center sm:text-xl md:text-3xl;
+  }
+
+    @keyframes appear {
+        0% {
+            opacity: 0;
+            transform: scale(0);
+        }
+        100% {
+            opacity: 1;
+            transform: scale(1);
+        }
+    }
+
+    @keyframes pop {
+        0% {
+            transform: scale(0);
+        }
+        50% {
+            transform: scale(1.2);
+        }
+        100% {
+            transform: scale(1);
+        }
+    }
+
+  .tile-new {
+    animation: appear 200ms ease 100ms;
+    animation-fill-mode: backwards;
+  }
+
+  .tile-merged {
+    animation: pop 200ms ease 100ms;
+    animation-fill-mode: backwards;
+  }
+
+  .tile-position-1-1 {
+    @apply text-red-400;
+  }
+
+  .tile-position-1-2 {
+    /* transform: translate(0px, 121px); */
+    @apply translate-x-8;
+  }
+
+  .tile-position-1-3 {
+    transform: translate(0px, 242px);
+  }
+
+  .tile-position-1-4 {
+    transform: translate(0px, 363px);
+  }
+
+  .tile-position-2-1 {
+    transform: translate(121px, 0px);
+  }
+
+  .tile-position-2-2 {
+    transform: translate(121px, 121px);
+  }
+
+  .tile-position-2-3 {
+    transform: translate(121px, 242px);
+  }
+
+  .tile-position-2-4 {
+    transform: translate(121px, 363px);
+  }
+
+  .tile-position-3-1 {
+    transform: translate(242px, 0px);
+  }
+
+  .tile-position-3-2 {
+    transform: translate(242px, 121px);
+  }
+
+  .tile-position-3-3 {
+    transform: translate(242px, 242px);
+  }
+
+  .tile-position-3-4 {
+    transform: translate(242px, 363px);
+  }
+
+  .tile-position-4-1 {
+    transform: translate(363px, 0px);
+  }
+
+  .tile-position-4-2 {
+    transform: translate(363px, 121px);
+  }
+
+  .tile-position-4-3 {
+    transform: translate(363px, 242px);
+  }
+
+  .tile-position-4-4 {
+    transform: translate(363px, 363px);
   }
 
   .tile-0 {
@@ -40,39 +134,39 @@
   }
 
   .tile-2 {
-    @apply bg-blue-100;
+    @apply bg-orange-100;
   }
 
   .tile-4 {
-    @apply bg-blue-200;
+    @apply bg-orange-200;
   }
 
   .tile-8 {
-    @apply bg-blue-300;
+    @apply bg-orange-300;
   }
 
   .tile-16 {
-    @apply bg-blue-400;
+    @apply bg-orange-400;
   }
 
   .tile-32 {
-    @apply bg-blue-500 text-slate-50;
+    @apply bg-orange-500 text-slate-50;
   }
 
   .tile-64 {
-    @apply bg-blue-600 text-slate-100;
+    @apply bg-orange-600 text-slate-100;
   }
 
   .tile-128 {
-    @apply bg-blue-700 text-slate-200;
+    @apply bg-orange-700 text-slate-200;
   }
 
   .tile-256 {
-    @apply bg-blue-800 text-slate-300;
+    @apply bg-orange-800 text-slate-300;
   }
 
   .tile-512 {
-    @apply bg-blue-900 text-slate-300;
+    @apply bg-orange-900 text-slate-300;
   }
 
   .tile-1024 {
@@ -86,5 +180,4 @@
   .tile-4096 {
     @apply bg-purple-800 text-slate-200;
   }
-
 }
diff --git a/test/cljs_2048/board_test.cljs b/test/cljs_2048/board_test.cljs
index c55cf6b..df9d997 100644
--- a/test/cljs_2048/board_test.cljs
+++ b/test/cljs_2048/board_test.cljs
@@ -4,46 +4,49 @@
    [cljs.test :refer-macros [deftest testing is]]))
 
 (deftest initial-board-test
-  (testing "Initial board must be 4x4"
-    (is (= (count sut/initial-board) 4))
-    (is (= (count (nth sut/initial-board 0)) 4))
-    (is (= (count (nth sut/initial-board 1)) 4))
-    (is (= (count (nth sut/initial-board 2)) 4))
-    (is (= (count (nth sut/initial-board 3)) 4)))
-
-  (testing "Inital board must be filled with zeroes"
-    (is (true? (every? zero? (nth sut/initial-board 0))))))
+  (testing "Inital board must be a 4x4 matrix filled with zeroes"
+    (is (= sut/initial-board
+              [[[0] [0] [0] [0]]
+               [[0] [0] [0] [0]]
+               [[0] [0] [0] [0]]
+               [[0] [0] [0] [0]]]))))
 
 (deftest set-tile
   (let [board sut/initial-board]
     (testing "Set value at given x and y"
-      (is (= (sut/set-tile board 1 2 4)
-             [[0 0 0 0]
-              [0 0 4 0]
-              [0 0 0 0]
-              [0 0 0 0]])))))
+      (is (= (sut/set-tile board 1 2 4 :state)
+             [[[0] [0] [0]        [0]]
+              [[0] [0] [4 :state] [0]]
+              [[0] [0] [0]        [0]]
+              [[0] [0] [0]        [0]]])))))
 
 (deftest get-tile
-  (let [board (sut/set-tile sut/initial-board 1 3 8)]
+  (let [board (sut/set-tile sut/initial-board 1 3 8 :state)]
     (testing "Get tile value of given x and y"
-      (is (= (sut/get-tile board 1 3) 8)))))
+      (is (= (sut/get-tile board 1 3) [8 :state])))))
 
 (deftest empty-tiles
-  (is (= (sut/empty-tiles [[1 2 3 0]
-                           [0 6 7 0]
-                           [9 0 11 12]
-                           [13 0 15 16]])
+  (is (empty? (sut/empty-tiles [[[1] [2] [3] [4]]
+                                [[5] [6] [7] [6]]
+                                [[9] [7] [11] [12]]
+                                [[13] [8] [15] [16]]])))
+
+  (is (= (sut/empty-tiles [[[1] [2] [3] [0]]
+                           [[0] [6] [7] [0]]
+                           [[9] [0] [11] [12]]
+                           [[13] [0] [15] [16]]])
          [[0 3] [1 0] [1 3] [2 1] [3 1]])))
 
 (deftest random-tile-test
-  (testing "returns board if board is full"
-    (let [board [[1 2 3 4]
-                 [5 6 7 8]
-                 [5 6 7 8]
-                 [5 6 7 8]]]
+  (testing "random-tile returns board if board is full"
+    (let [board [[[1] [2] [3] [4]]
+                 [[5] [6] [7] [8]]
+                 [[5] [6] [7] [8]]
+                 [[5] [6] [7] [8]]]]
       (is (= (sut/random-tile board)
              board)))))
 
+;; Transpose Test
 (def test-board
   [[1 2 3 4]
    [5 6 7 8]
@@ -72,50 +75,67 @@
           [15 11 7 3]
           [16 12 8 4]])))
 
+;; End of transpose test
+
 (deftest fill-zeroes-test
   (testing "fills empty vector with n zeroes"
     (is (= (sut/fill-zeroes [] 10)
-           [0 0 0 0 0 0 0 0 0 0])))
+            [[0] [0] [0] [0] [0] [0] [0] [0] [0] [0]])))
 
   (testing "fills non-empty vector with no zeroes"
-    (is (= (sut/fill-zeroes [2 4] 7)
-           [2 4 0 0 0 0 0])))
+    (is (= (sut/fill-zeroes [[2] [4]] 7)
+           [[2] [4] [0] [0] [0] [0] [0]])))
 
   (testing "if vector size is = n, return the vector"
-    (is (= (sut/fill-zeroes [2 4] 2)
-           [2 4])))
+    (is (= (sut/fill-zeroes [[2] [4]] 2)
+           [[2] [4]])))
 
   (testing "if vector size is > n, return the vector"
     (is (= (sut/fill-zeroes [1 2 3 4] 2)
-           [1 2 3 4])))
-
-  (testing "default n is 4"
-    (is (= (sut/fill-zeroes [1 2])
-           [1 2 0 0]))))
+           [1 2 3 4]))))
 
 (deftest combine-test
-  (is (= (sut/combine [2 2 0 0])
-         [4 0 0 0]))
+  (is (= (sut/combine [[2] [2] [0] [0]])
+         [[4 :merged] [0] [0] [0]]))
+
+  (is (= (sut/combine [[4] [4] [2] [2]])
+         [[8 :merged] [4 :merged] [0] [0]]))
+
+  (is (= (sut/combine [[1] [2] [3] [4]])
+         [[1] [2] [3] [4]]))
+
+  (is (= (sut/combine [[4] [4] [4] [4]])
+         [[8 :merged] [8 :merged] [0] [0]]))
+
+  (is (= (sut/combine [[2] [0] [4] [4]])
+         [[2] [8 :merged] [0] [0]]))
+
+  (is (= (sut/combine [[0] [0] [4] [4]])
+         [[8 :merged] [0] [0] [0]]))
+
+  (is (= (sut/combine [[4] [4] [0] [4]])
+         [[8 :merged] [4] [0] [0]]))
 
-  (is (= (sut/combine [4 4 2 2])
-         [8 4 0 0]))
+  (is (= (sut/combine [[4] [4] [8] [4]])
+         [[8 :merged] [8] [4] [0]]))
 
-  (is (= (sut/combine [1 2 3 4])
-         [1 2 3 4]))
+  (is (= (sut/combine [[4] [2] [2] [0]])
+         [[4] [4 :merged] [0] [0]]))
 
-  (is (= (sut/combine [4 2 2 0])
-         [4 4 0 0]))
+  (testing "with random and merged"
+    (is (= (sut/combine [[4] [2 :random] [2 :merged] [0]])
+         [[4] [4 :merged] [0] [0]])))
 
   (testing "map combine for a matrix"
     (is (= (map sut/combine
-                [[4 4 2 2]
-                 [6 4 2 2]
-                 [8 8 2 0]
-                 [6 8 2 2]])
-           [[8 4 0 0]
-            [6 4 4 0]
-            [16 2 0 0]
-            [6 8 4 0]]))))
+                [[[4] [4] [2] [2]]
+                 [[6] [4] [2] [2]]
+                 [[8] [8] [2] [0]]
+                 [[6] [8] [2] [2]]])
+           [[[8 :merged]  [4 :merged] [0]         [0]]
+            [[6]          [4]         [4 :merged] [0]]
+            [[16 :merged] [2]         [0]         [0]]
+            [[6]          [8]         [4 :merged] [0]]]))))
 
 (deftest reverse-test
   (is (= (sut/reverse-board test-board)
@@ -127,62 +147,62 @@
 (deftest stack-left
   (testing "Move all tiles to left - single column"
     (is (= (sut/stack-left
-            [[0 2 4 6]
-             [0 4 6 8]
-             [0 6 8 10]
-             [0 8 10 12]])
-           [[2 4 6 0]
-            [4 6 8 0]
-            [6 8 10 0]
-            [8 10 12 0]])))
+            [[[0] [2] [4] [6]]
+             [[0] [4] [6] [8]]
+             [[0] [6] [8] [10]]
+             [[0] [8] [10] [12]]])
+           [[[2] [4] [6] [0]]
+            [[4] [6] [8] [0]]
+            [[6] [8] [10] [0]]
+            [[8] [10] [12] [0]]])))
 
   (testing "Move all tiles to left - two columns"
     (is (= (sut/stack-left
-            [[0 0 4 6]
-             [0 0 6 8]
-             [0 0 8 10]
-             [0 0 10 12]])
-           [[4 6 0 0]
-            [6 8 0 0]
-            [8 10 0 0]
-            [10 12 0 0]])))
+            [[[0] [0] [4] [6]]
+             [[0] [0] [6] [8]]
+             [[0] [0] [8] [10]]
+             [[0] [0] [10] [12]]])
+           [[[4] [6] [0] [0]]
+            [[6] [8] [0] [0]]
+            [[8] [10] [0] [0]]
+            [[10] [12] [0] [0]]])))
 
   (testing "Move all tiles to left - mixed column"
     (is (= (sut/stack-left
-            [[0 2 0 6]
-             [0 4 0 8]
-             [0 6 0 10]
-             [0 8 0 12]])
-           [[2 6 0 0]
-            [4 8 0 0]
-            [6 10 0 0]
-            [8 12 0 0]]))))
+            [[[0] [2] [0] [6]]
+             [[0] [4] [0] [8]]
+             [[0] [6] [0] [10]]
+             [[0] [8] [0] [12]]])
+           [[[2] [6] [0] [0]]
+            [[4] [8] [0] [0]]
+            [[6] [10] [0] [0]]
+            [[8] [12] [0] [0]]]))))
 
 (deftest move-tiles-left
   (testing "Stack vector to left - three"
-    (is (= (sut/move-tiles-left [0 2 4 6])
-           [2 4 6 0])))
+    (is (= (sut/move-tiles-left [[0] [2] [4] [6]])
+           [[2] [4] [6] [0]])))
 
   (testing "Stack vector to left - two"
-    (is (= (sut/move-tiles-left [0 0 4 6])
-           [4 6 0 0])))
+    (is (= (sut/move-tiles-left [[0] [0] [4] [6]])
+           [[4] [6] [0] [0]])))
 
   (testing "Stack vector to left - single "
-    (is (= (sut/move-tiles-left [0 0 0 6])
-           [6 0 0 0])))
+    (is (= (sut/move-tiles-left [[0] [0] [0] [6]])
+           [[6] [0] [0] [0]])))
 
   (testing "Stack vector to left - all zeroes"
-    (is (= (sut/move-tiles-left [0 0 0 0])
-           [0 0 0 0])))
+    (is (= (sut/move-tiles-left [[0] [0] [0] [0]])
+           [[0] [0] [0] [0]])))
 
   (testing "Stack vector to left - all numbers"
-    (is (= (sut/move-tiles-left [2 4 6 8])
-           [2 4 6 8])))
+    (is (= (sut/move-tiles-left [[2] [4] [6] [8]])
+           [[2] [4] [6] [8]])))
 
   (testing "Stack vector to left - zero in the middle"
-    (is (= (sut/move-tiles-left [2 4 0 8])
-           [2 4 8 0])))
+    (is (= (sut/move-tiles-left [[2] [4] [0] [8]])
+           [[2] [4] [8] [0]])))
 
   (testing "Stack vector to left - zeroes in the middle"
-    (is (= (sut/move-tiles-left [2 0 0 8])
-           [2 8 0 0]))))
+    (is (= (sut/move-tiles-left [[2] [0] [0] [8]])
+           [[2] [8] [0] [0]]))))
diff --git a/test/cljs_2048/game_test.cljs b/test/cljs_2048/game_test.cljs
index b1e3150..37948d3 100644
--- a/test/cljs_2048/game_test.cljs
+++ b/test/cljs_2048/game_test.cljs
@@ -5,26 +5,38 @@
    [cljs.test :refer-macros [deftest testing is]]))
 
 (deftest can-move-sideways?-test
-  (is (true? (sut/can-move-sideways? [2 2 3 4])))
-  (is (true? (sut/can-move-sideways? [1 3 3 4])))
-  (is (true? (sut/can-move-sideways? [1 2 4 4])))
-  (is (true? (sut/can-move-sideways? [2 2 2 4])))
-  (is (true? (sut/can-move-sideways? [1 2 2 2])))
-  (is (nil? (sut/can-move-sideways? [1 2 3 4]))))
-
-(def can-move-sideways [[2 8 2 4]
-                        [4 2 4 8]
-                        [2 8 2 2]
-                        [4 2 4 8]])
-
-(def can-move-up-or-down [[2 8 2 4]
-                          [4 2 4 8]
-                          [2 8 2 4]
-                          [4 8 4 8]])
+  (is (true? (sut/can-move-sideways? [[2] [2] [3] [4]])))
+  (is (true? (sut/can-move-sideways? [[1] [3] [3] [4]])))
+  (is (true? (sut/can-move-sideways? [[1] [2] [4] [4]])))
+  (is (true? (sut/can-move-sideways? [[2] [2] [2] [4]])))
+  (is (true? (sut/can-move-sideways? [[1] [2] [2] [2]])))
+  (is (true? (sut/can-move-sideways? [[0] [2] [0] [2]])))
+  (is (nil? (sut/can-move-sideways? [[1] [2] [3] [4]])))
+
+  (is (true? (sut/can-move-sideways? [[4 :random] [4 :merged] [4 :random] [0]])))
+  (is (true? (sut/can-move-sideways? [[0] [8 :merged] [4 :random] [4 :merged]])))
+  (is (true? (sut/can-move-sideways?
+                [[4 :merged] [4 :random] [2 :random] [0]]))))
+
+(def can-move-sideways [[[2] [8] [2]         [4]]
+                        [[4] [2] [4]         [8]]
+                        [[2] [8] [2 :random] [2 :merged]]
+                        [[4] [2] [4]         [8]]])
+
+(def can-move-up-or-down [[[2] [8] [2] [4]]
+                          [[4] [2] [4] [8]]
+                          [[2] [8] [2] [4]]
+                          [[4] [8] [4] [8]]])
 
 (deftest can-move-test
   (is (true? (sut/can-move? can-move-sideways)))
-  (is (true? (sut/can-move? can-move-up-or-down))))
+  (is (true? (sut/can-move? can-move-up-or-down)))
+
+  (is (true? (sut/can-move?
+              [[[0] [8 :merged] [4 :random] [4 :merged]]
+               [[0] [0] [0] [4 :merged]]
+               [[0] [0] [4 :random] [2 :random]]
+               [[0] [0] [0] [0]]]))))
 
 (deftest gameover?-test
   (testing "game not over, when there can be move to left"
@@ -34,23 +46,23 @@
     (is (false? (sut/gameover? can-move-up-or-down))))
 
   (testing "game over, when there can be no more moves"
-    (is (true? (sut/gameover? [[2 4 2 4]
-                               [4 2 4 2]
-                               [2 4 2 4]
-                               [4 2 4 2]])))))
+    (is (true? (sut/gameover? [[[2] [4] [2] [4]]
+                               [[4] [2] [4] [2]]
+                               [[2] [4] [2] [4]]
+                               [[4] [2] [4] [2]]])))))
 
 (def test-board-2
-  [[1 2 3 4]
-   [0 6 7 8]
-   [0 0 11 12]
-   [0 0 0 16]])
+  [[[1] [2] [3] [4]]
+   [[0] [6] [7] [8]]
+   [[0] [0] [11] [12]]
+   [[0] [0] [0] [16]]])
 
 (deftest move-left-test
   (is (= (sut/move-left test-board-2)
-         [[1 2 3 4]
-          [6 7 8 0]
-          [11 12 0 0]
-          [16 0 0 0]])))
+         [[[1] [2] [3] [4]]
+          [[6] [7] [8] [0]]
+          [[11] [12] [0] [0]]
+          [[16] [0] [0] [0]]])))
 
 (deftest move-right-test
   (is (= (sut/move-right (sut/move-left test-board-2))
@@ -58,48 +70,81 @@
 
 (deftest move-down-test
   (is (= (sut/move-down test-board-2)
-         [[0 0 0 4]
-          [0 0 3 8]
-          [0 2 7 12]
-          [1 6 11 16]])))
+         [[[0] [0] [0] [4]]
+          [[0] [0] [3] [8]]
+          [[0] [2] [7] [12]]
+          [[1] [6] [11] [16]]])))
 
 (deftest move-up-test
   (is (= (sut/move-up (sut/move-up test-board-2))
          test-board-2)))
 
 (def test-board-3
-  [[0 0 0 8]
-   [0 2 2 8]
-   [4 4 8 8]
-   [0 16 8 16]])
+  [[[0] [0] [0] [8]]
+   [[0] [2] [2] [8]]
+   [[4] [4] [8] [8]]
+   [[0] [16] [8] [16]]])
 
 (deftest move-left-and-combine
   (is (= (sut/move-left test-board-3)
-         [[8 0 0 0]
-          [4 8 0 0]
-          [8 16 0 0]
-          [16 8 16 0]])))
+         [[[8]         [0]          [0] [0]]
+          [[4 :merged] [8]          [0] [0]]
+          [[8 :merged] [16 :merged] [0] [0]]
+          [[16]        [8]          [16] [0]]])))
 
 (deftest move-right-and-combine
   (is (= (sut/move-right test-board-3)
-         [[0 0 0 8]
-          [0 0 4 8]
-          [0 0 8 16]
-          [0 16 8 16]])))
+         [[[0] [0]  [0]         [8]]
+          [[0] [0]  [4 :merged] [8]]
+          [[0] [0]  [8 :merged] [16 :merged]]
+          [[0] [16] [8]         [16]]])))
 
 (deftest move-up-and-combine
   (is (= (sut/move-up test-board-3)
-         [[4 2 2 16]
-          [0 4 16 8]
-          [0 16 0 16]
-          [0 0 0 0]])))
+         [[[4] [2]  [2]          [16 :merged]]
+          [[0] [4]  [16 :merged] [8]]
+          [[0] [16] [0]          [16]]
+          [[0] [0]  [0]          [0]]])))
 
 (deftest move-down-and-combine
   (is (= (sut/move-down test-board-3)
-         [[0 0 0 0]
-          [0 2 0 8]
-          [0 4 2 16]
-          [4 16 16 16]])))
+         [[[0] [0]  [0]          [0]]
+          [[0] [2]  [0]          [8]]
+          [[0] [4]  [2]          [16 :merged]]
+          [[4] [16] [16 :merged] [16]]])))
+
+(deftest move-down-and-combine-2
+  (is (= (sut/move-down [[[2] [4] [2] [2]]
+                         [[4] [32] [8] [4]]
+                         [[4] [4] [2] [8]]
+                         [[4] [4] [16] [2]]])
+
+         [[[0]         [0]         [2] [2]]
+          [[2]         [4]         [8] [4]]
+          [[4]         [32]        [2] [8]]
+          [[8 :merged] [8 :merged] [16] [2]]])))
+
+(deftest move-up-and-combine-2
+  (is (= (sut/move-up   [[[2] [4] [2] [2]]
+                         [[4] [32] [8] [4]]
+                         [[4] [4] [2] [8]]
+                         [[4] [4] [16] [2]]])
+
+         [[[2]         [4]         [2] [2]]
+          [[8 :merged] [32]        [8] [4]]
+          [[4]         [8 :merged] [2] [8]]
+          [[0]         [0]         [16] [2]]])))
+
+(deftest move-left-and-combine-2
+  (is (= (sut/move-left [[[2] [4] [2] [2]]
+                         [[4] [32] [8] [4]]
+                         [[4] [4] [2] [8]]
+                         [[4] [4] [16] [2]]])
+
+         [[[2]         [4]  [4 :merged] [0]]
+          [[4]         [32] [8]         [4]]
+          [[8 :merged] [2]  [8]         [0]]
+          [[8 :merged] [16] [2]         [0]]])))
 
 (deftest move-test
   (testing "direction works!"
@@ -118,10 +163,10 @@
 
   (testing "add random tile only when board has changed"
     (with-redefs [board/random-tile (fn [_] ::random-tile-added)]
-      (let [board [[2 0 0 0]
-                   [2 0 0 0]
-                   [4 0 0 0]
-                   [4 0 0 0]]]
+      (let [board [[[2] [0] [0] [0]]
+                   [[2] [0] [0] [0]]
+                   [[4] [0] [0] [0]]
+                   [[4] [0] [0] [0]]]]
         (is (= (sut/move board ::sut/left)
                board))