diff --git a/package.json b/package.json
index 6c4ff5d..55179c7 100644
--- a/package.json
+++ b/package.json
@@ -8,9 +8,9 @@
     "setup": "pnpm clone:all && pnpm install:all",
     "clean": "pnpm run clean:all",
     "clean:all": "pnpm run clean:modules && pnpm run clean:extollo",
-    "clean:modules": "rm -rf modules/lib modules/di modules/orm modules/util modules/cli modules/i18n",
+    "clean:modules": "rm -rf modules/lib modules/di modules/orm modules/util modules/cli modules/i18n modules/forms",
     "clean:extollo": "rm -rf extollo",
-    "clone:all": "pnpm run clone:lib && pnpm run clone:di && pnpm run clone:util && pnpm run clone:orm && pnpm run clone:cli && pnpm run clone:i18n && pnpm run clone:extollo",
+    "clone:all": "pnpm run clone:lib && pnpm run clone:di && pnpm run clone:util && pnpm run clone:orm && pnpm run clone:cli && pnpm run clone:i18n && pnpm run clone:forms && pnpm run clone:extollo",
     "clone:extollo": "git clone ${npm_config_git:-https://code.garrettmills.dev/extollo/}extollo extollo",
     "clone:lib": "git clone ${npm_config_git:-https://code.garrettmills.dev/extollo/}lib modules/lib",
     "clone:di": "git clone ${npm_config_git:-https://code.garrettmills.dev/extollo/}di modules/di",
@@ -18,23 +18,26 @@
     "clone:orm": "git clone ${npm_config_git:-https://code.garrettmills.dev/extollo/}orm modules/orm",
     "clone:cli": "git clone ${npm_config_git:-https://code.garrettmills.dev/extollo/}cli modules/cli",
     "clone:i18n": "git clone ${npm_config_git:-https://code.garrettmills.dev/extollo/}i18n modules/i18n",
-    "install:all": "pnpm run install:util && pnpm run install:di && pnpm run install:lib && pnpm run install:cli && pnpm run install:orm && pnpm run install:i18n && pnpm run install:extollo",
-    "install:extollo": "cd extollo && cp example.env .env && pnpm i --save @extollo/cli@file:../modules/cli @extollo/orm@file:../modules/orm @extollo/di@file:../modules/di @extollo/lib@file:../modules/lib @extollo/util@file:../modules/util @extollo/i18n@file:../modules/i18n",
+    "clone:forms": "git clone ${npm_config_git:-https://code.garrettmills.dev/extollo/}forms modules/forms",
+    "install:all": "pnpm run install:util && pnpm run install:di && pnpm run install:lib && pnpm run install:cli && pnpm run install:orm && pnpm run install:i18n && pnpm run install:forms && pnpm run install:extollo",
+    "install:extollo": "cd extollo && cp example.env .env && pnpm i --save @extollo/cli@file:../modules/cli @extollo/orm@file:../modules/orm @extollo/di@file:../modules/di @extollo/lib@file:../modules/lib @extollo/util@file:../modules/util @extollo/i18n@file:../modules/i18n @extollo/forms@file:../modules/forms",
     "install:lib": "cd modules/lib && pnpm i --save @extollo/di@file:../di @extollo/util@file:../util && pnpm run build && cd ../..",
     "install:di": "cd modules/di && pnpm i --save @extollo/util@file:../util && pnpm run build && cd ../..",
     "install:util": "cd modules/util && pnpm i && pnpm run build && cd ../..",
     "install:orm": "cd modules/orm && pnpm i --save @extollo/cli@file:../cli @extollo/di@file:../di @extollo/lib@file:../lib @extollo/util@file:../util && pnpm run build && cd ../..",
     "install:cli": "cd modules/cli && pnpm i --save @extollo/di@../di @extollo/lib@../lib @extollo/util@../util && pnpm run build && cd ../..",
     "install:i18n": "cd modules/i18n && pnpm i --save @extollo/cli@file:../cli @extollo/di@file:../di @extollo/lib@file:../lib @extollo/util@file:../util && pnpm run build && cd ../..",
+    "install:forms": "cd modules/forms && pnpm i --save @extollo/cli@file:../cli @extollo/di@file:../di @extollo/lib@file:../lib @extollo/util@file:../util && pnpm run build && cd ../..",
     "build": "pnpm build:all",
-    "build:all": "pnpm build:util && pnpm build:di && pnpm build:lib && pnpm build:cli && pnpm build:orm && pnpm build:i18n && pnpm build:extollo",
+    "build:all": "pnpm build:util && pnpm build:di && pnpm build:lib && pnpm build:cli && pnpm build:orm && pnpm build:i18n && pnpm build:forms && pnpm build:extollo",
     "build:extollo": "cd extollo && pnpm run build",
     "build:lib": "cd modules/lib && pnpm run build",
     "build:di": "cd modules/di && pnpm run build",
     "build:util": "cd modules/util && pnpm run build",
     "build:orm": "cd modules/orm && pnpm run build",
     "build:cli": "cd modules/cli && pnpm run build",
-    "build:i18n": "cd modules/i18n && pnpm run build"
+    "build:i18n": "cd modules/i18n && pnpm run build",
+    "build:forms": "cd modules/forms && pnpm run build"
   },
   "repository": {
     "type": "git",