diff --git a/package-lock.json b/package-lock.json
index 65e8eb2..ac28db5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,15 +11,16 @@
         "@headlessui-float/react": "^0.11.2",
         "@headlessui/react": "^1.7.14",
         "@heroicons/react": "^2.0.18",
+        "@hookform/resolvers": "^3.9.1",
         "@radix-ui/react-checkbox": "^1.0.4",
         "@radix-ui/react-dialog": "^1.0.4",
         "@radix-ui/react-dropdown-menu": "^2.0.5",
         "@radix-ui/react-hover-card": "^1.0.6",
-        "@radix-ui/react-label": "^2.0.2",
+        "@radix-ui/react-label": "^2.1.0",
         "@radix-ui/react-navigation-menu": "^1.1.3",
         "@radix-ui/react-select": "^1.2.2",
         "@radix-ui/react-separator": "^1.0.3",
-        "@radix-ui/react-slot": "^1.0.2",
+        "@radix-ui/react-slot": "^1.1.0",
         "@radix-ui/react-tooltip": "^1.0.7",
         "@remixicon/react": "^4.2.0",
         "@tanstack/react-query": "^4.29.12",
@@ -44,10 +45,12 @@
         "postcss": "8.4.23",
         "react": "18.2.0",
         "react-dom": "18.2.0",
+        "react-hook-form": "^7.53.2",
         "tailwind-merge": "^1.13.2",
         "tailwindcss": "^3.4.3",
         "tailwindcss-animate": "^1.0.6",
-        "typescript": "5.0.4"
+        "typescript": "5.0.4",
+        "zod": "^3.23.8"
       },
       "devDependencies": {
         "@tailwindcss/forms": "^0.5.7",
@@ -1181,6 +1184,15 @@
         "react": ">= 16"
       }
     },
+    "node_modules/@hookform/resolvers": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-3.9.1.tgz",
+      "integrity": "sha512-ud2HqmGBM0P0IABqoskKWI6PEf6ZDDBZkFqe2Vnl+mTHCEHzr3ISjjZyCwTjC/qpL25JC9aIDkloQejvMeq0ug==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react-hook-form": "^7.0.0"
+      }
+    },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.8",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
@@ -1608,6 +1620,25 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-collection/node_modules/@radix-ui/react-slot": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz",
+      "integrity": "sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.13.10",
+        "@radix-ui/react-compose-refs": "1.0.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-compose-refs": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.1.tgz",
@@ -1678,6 +1709,25 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-slot": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz",
+      "integrity": "sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.13.10",
+        "@radix-ui/react-compose-refs": "1.0.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-direction": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.0.1.tgz",
@@ -1843,18 +1893,41 @@
       }
     },
     "node_modules/@radix-ui/react-label": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.0.2.tgz",
-      "integrity": "sha512-N5ehvlM7qoTLx7nWPodsPYPgMzA5WM8zZChQg8nyFJKnDO5WHdba1vv5/H6IO5LtJMfD2Q3wh1qHFGNtK0w3bQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.0.tgz",
+      "integrity": "sha512-peLblDlFw/ngk3UWq0VnYaOLy6agTZZ+MUO/WhVfm14vJGML+xH4FAl2XQGLqdefjNb7ApRg6Yn7U42ZhmYXdw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.13.10",
-        "@radix-ui/react-primitive": "1.0.3"
+        "@radix-ui/react-primitive": "2.0.0"
       },
       "peerDependencies": {
         "@types/react": "*",
         "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0",
-        "react-dom": "^16.8 || ^17.0 || ^18.0"
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-label/node_modules/@radix-ui/react-primitive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.0.tgz",
+      "integrity": "sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-slot": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
       },
       "peerDependenciesMeta": {
         "@types/react": {
@@ -1905,6 +1978,25 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-slot": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz",
+      "integrity": "sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.13.10",
+        "@radix-ui/react-compose-refs": "1.0.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-navigation-menu": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.1.3.tgz",
@@ -2043,6 +2135,25 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-primitive/node_modules/@radix-ui/react-slot": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz",
+      "integrity": "sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.13.10",
+        "@radix-ui/react-compose-refs": "1.0.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-roving-focus": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.0.4.tgz",
@@ -2117,6 +2228,25 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-slot": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz",
+      "integrity": "sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.13.10",
+        "@radix-ui/react-compose-refs": "1.0.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-separator": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.0.3.tgz",
@@ -2141,16 +2271,31 @@
       }
     },
     "node_modules/@radix-ui/react-slot": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz",
-      "integrity": "sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz",
+      "integrity": "sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.13.10",
-        "@radix-ui/react-compose-refs": "1.0.1"
+        "@radix-ui/react-compose-refs": "1.1.0"
       },
       "peerDependencies": {
         "@types/react": "*",
-        "react": "^16.8 || ^17.0 || ^18.0"
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-slot/node_modules/@radix-ui/react-compose-refs": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.0.tgz",
+      "integrity": "sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
       },
       "peerDependenciesMeta": {
         "@types/react": {
@@ -2274,6 +2419,25 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/react-slot": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz",
+      "integrity": "sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.13.10",
+        "@radix-ui/react-compose-refs": "1.0.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-use-callback-ref": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.1.tgz",
@@ -7374,6 +7538,15 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/next/node_modules/zod": {
+      "version": "3.21.4",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz",
+      "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
     "node_modules/node-releases": {
       "version": "2.0.12",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz",
@@ -8319,6 +8492,22 @@
         "react": "^18.2.0"
       }
     },
+    "node_modules/react-hook-form": {
+      "version": "7.53.2",
+      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.53.2.tgz",
+      "integrity": "sha512-YVel6fW5sOeedd1524pltpHX+jgU2u3DSDtXEaBORNdqiNrsX/nUI/iGXONegttg0mJVnfrIkiV0cmTU6Oo2xw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/react-hook-form"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17 || ^18 || ^19"
+      }
+    },
     "node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
@@ -10015,9 +10204,10 @@
       }
     },
     "node_modules/zod": {
-      "version": "3.21.4",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz",
-      "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==",
+      "version": "3.23.8",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
+      "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/package.json b/package.json
index 1e0a2c7..382e746 100644
--- a/package.json
+++ b/package.json
@@ -17,15 +17,16 @@
     "@headlessui-float/react": "^0.11.2",
     "@headlessui/react": "^1.7.14",
     "@heroicons/react": "^2.0.18",
+    "@hookform/resolvers": "^3.9.1",
     "@radix-ui/react-checkbox": "^1.0.4",
     "@radix-ui/react-dialog": "^1.0.4",
     "@radix-ui/react-dropdown-menu": "^2.0.5",
     "@radix-ui/react-hover-card": "^1.0.6",
-    "@radix-ui/react-label": "^2.0.2",
+    "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-navigation-menu": "^1.1.3",
     "@radix-ui/react-select": "^1.2.2",
     "@radix-ui/react-separator": "^1.0.3",
-    "@radix-ui/react-slot": "^1.0.2",
+    "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-tooltip": "^1.0.7",
     "@remixicon/react": "^4.2.0",
     "@tanstack/react-query": "^4.29.12",
@@ -50,10 +51,12 @@
     "postcss": "8.4.23",
     "react": "18.2.0",
     "react-dom": "18.2.0",
+    "react-hook-form": "^7.53.2",
     "tailwind-merge": "^1.13.2",
     "tailwindcss": "^3.4.3",
     "tailwindcss-animate": "^1.0.6",
-    "typescript": "5.0.4"
+    "typescript": "5.0.4",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@tailwindcss/forms": "^0.5.7",
diff --git a/src/app/components/portfolio/AddNew.tsx b/src/app/components/portfolio/AddNew.tsx
index aefb36f..5a347e0 100644
--- a/src/app/components/portfolio/AddNew.tsx
+++ b/src/app/components/portfolio/AddNew.tsx
@@ -5,7 +5,7 @@ import {
   NavigationMenuLink,
   NavigationMenuTrigger,
 } from "@/app/shadcn_components/ui/navigation-menu";
-import { PlusIcon, TableCellsIcon } from "@heroicons/react/24/outline";
+import { PlusIcon, TableCellsIcon, DocumentMagnifyingGlassIcon } from "@heroicons/react/24/outline";
 import * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -39,9 +39,13 @@ ListItem.displayName = "ListItem";
 export default function AddNewDropDown({
   isUploadCsvOpen,
   setIsUploadCsvOpen,
+  isRemoteAssesmentOpen,
+  setIsRemoteAssesmentOpen,
 }: {
   isUploadCsvOpen: boolean;
   setIsUploadCsvOpen: React.Dispatch<React.SetStateAction<boolean>>;
+  isRemoteAssesmentOpen: boolean;
+  setIsRemoteAssesmentOpen: React.Dispatch<React.SetStateAction<boolean>>;
 }) {
   function handleCickAddUnit() {
     console.log("Add unit");
@@ -51,6 +55,10 @@ export default function AddNewDropDown({
     setIsUploadCsvOpen(!isUploadCsvOpen);
   }
 
+  function handleClickRemoteAssesment() {
+    setIsRemoteAssesmentOpen(!isRemoteAssesmentOpen);
+  }
+
   return (
     <NavigationMenuItem>
       <NavigationMenuTrigger className="bg-gray-50">
@@ -63,7 +71,12 @@ export default function AddNewDropDown({
               <PlusIcon className="h-4 w-4 mr-2" /> Add Unit
             </div>
           </ListItem>
-
+          <ListItem onClick={handleClickRemoteAssesment}>
+            <div className="font-medium items-center flex text-sm text-gray-900 justify-start">
+              <DocumentMagnifyingGlassIcon className="h-4 w-4 mr-2" /> Remote Assesment
+            </div>
+            Schedule a remote assesment
+          </ListItem>
           <ListItem onClick={handleClickUploadCSV}>
             <div className="font-medium items-center flex text-sm text-gray-900 justify-start">
               <TableCellsIcon className="h-4 w-4 mr-2" /> Upload CSV
diff --git a/src/app/components/portfolio/Toolbar.tsx b/src/app/components/portfolio/Toolbar.tsx
index d09da5c..b375443 100644
--- a/src/app/components/portfolio/Toolbar.tsx
+++ b/src/app/components/portfolio/Toolbar.tsx
@@ -13,6 +13,7 @@ import {
 import AddNewDropDown from "./AddNew";
 import { cva } from "class-variance-authority";
 import UploadCsvModal from "@/app/portfolio/[slug]/components/UploadCsvModal";
+import RemoteAssesmentModal from "@/app/portfolio/[slug]/components/RemoteAssesmentModal";
 import { useState } from "react";
 import { useRouter } from "next/navigation";
 
@@ -40,6 +41,7 @@ export function Toolbar({ portfolioId }: ToolbarProps) {
   }
 
   const [modalIsOpen, setModalIsOpen] = useState(false);
+  const [isRemoteAssesmentOpen, setIsRemoteAssesmentOpen] = useState(false);
 
   return (
     <NavigationMenu>
@@ -71,8 +73,15 @@ export function Toolbar({ portfolioId }: ToolbarProps) {
         <AddNewDropDown
           isUploadCsvOpen={modalIsOpen}
           setIsUploadCsvOpen={setModalIsOpen}
+          isRemoteAssesmentOpen={isRemoteAssesmentOpen}
+          setIsRemoteAssesmentOpen={setIsRemoteAssesmentOpen}
         />
       </NavigationMenuList>
+      <RemoteAssesmentModal
+        isOpen={isRemoteAssesmentOpen}
+        setIsOpen={setIsRemoteAssesmentOpen}
+        portfolioId={portfolioId}
+      />
       <UploadCsvModal
         isOpen={modalIsOpen}
         setIsOpen={setModalIsOpen}
diff --git a/src/app/portfolio/[slug]/components/RemoteAssesmentModal.tsx b/src/app/portfolio/[slug]/components/RemoteAssesmentModal.tsx
new file mode 100644
index 0000000..a98dd0b
--- /dev/null
+++ b/src/app/portfolio/[slug]/components/RemoteAssesmentModal.tsx
@@ -0,0 +1,304 @@
+"use client";
+
+import { Dialog, Transition, Menu } from "@headlessui/react";
+import { useState, Fragment, useEffect } from "react";
+import { Input } from "@/app/shadcn_components/ui/input";
+import { Button } from "@/app/shadcn_components/ui/button";
+import { Float } from "@headlessui-float/react";
+import { ChevronDownIcon } from "@heroicons/react/20/solid";
+
+type Option = {
+  label: string;
+  value: string;
+  disabled: boolean;
+};
+
+type DropdownProps = {
+  options: Option[];
+  selectedOption: string;
+  onSelectOption: (option: Option) => void;
+};
+
+const selecthousingTypeOptions = [
+  {
+    label: "Social",
+    value: "Social",
+    disabled: false,
+  },
+  {
+    label: "Private",
+    value: "Private",
+    disabled: false,
+  },
+];
+
+const selectGoalOptions = [
+  {
+    label: "Increase EPC",
+    value: "Increase EPC",
+    disabled: false,
+  },
+  {
+    label: "Reduce energy consumption",
+    value: "Reduce energy consumption",
+    disabled: false,
+  },
+];
+
+const goalValueOptions = [
+  {
+    label: "C",
+    value: "C",
+    disabled: false,
+  },
+  {
+    label: "B",
+    value: "B",
+    disabled: false,
+  },
+  {
+    label: "A",
+    value: "A",
+    disabled: false,
+  },
+];
+
+
+
+export function SelectDropdown({
+  options,
+  selectedOption,
+  onSelectOption,
+}: DropdownProps) {
+  return (
+    <Menu as="div" className="relative inline-block text-left w-full">
+      <Float>
+        <Menu.Button className="inline-flex justify-center w-1/2 px-4 py-2 text-sm font-medium text-white bg-brandblue rounded-md focus:outline-none focus-visible:ring-2 focus-visible:ring-white focus-visible:ring-opacity-75">
+          {selectedOption || "Select an option"}
+          <ChevronDownIcon
+            className="ml-2 -mr-1 h-5 w-5 text-violet-200 hover:text-violet-100"
+            aria-hidden="true"
+          />
+        </Menu.Button>
+        <Transition
+          as={Fragment}
+          enter="transition ease-out duration-200"
+          enterFrom="opacity-0 scale-95"
+          enterTo="opacity-100 scale-100"
+          leave="transition ease-in duration-150"
+          leaveFrom="opacity-100 scale-100"
+          leaveTo="opacity-0 scale-95"
+        >
+          <Menu.Items className=" origin-bottom left-0 w-56 rounded-md shadow-lg bg-white ring-1 ring-black ring-opacity-5 focus:outline-none">
+            {options.map((option) => (
+              <Menu.Item key={option.value} disabled={option.disabled}>
+                {({ active }) => (
+                  <button
+                    className={`${
+                      active
+                        ? "bg-brandmidblue text-white w-full"
+                        : "text-gray-900 w-full"
+                    } group flex items-center  px-4 py-2 text-sm `}
+                    onClick={() => onSelectOption(option)}
+                  >
+                    {option.label}
+                  </button>
+                )}
+              </Menu.Item>
+            ))}
+          </Menu.Items>
+        </Transition>
+      </Float>
+    </Menu>
+  );
+}
+
+
+export default function RemoteAssesmentModal({
+  portfolioId,
+  isOpen,
+  setIsOpen,
+}: {
+  isOpen: boolean;
+  setIsOpen: (isOpen: boolean) => void;
+  portfolioId: string;
+}) {
+  const [scenario, setScenario] = useState<undefined | string>(undefined);
+  const [housingType, sethousingType] = useState<string>("");
+  const [selectedGoal, setSelectedGoal] = useState<string>("");
+  const [goalValue, setGoalValue] = useState<string>("");
+  const [addressLineOne, setAddressLineOne] = useState<string>("");
+  const [postcode, setPostcode] = useState<string>("");
+  const [uprn, setUprn] = useState<number | string | null>("");
+  const [valuation, setValuation] = useState<number | string | null>("");
+  const [buttonDisabled, setButtonDisabled] = useState(true);
+
+  function handleScenarioChange(event: React.ChangeEvent<HTMLInputElement>) {
+    setScenario(event.target.value);
+  }
+
+  function handleAddressLineOneChange(event: React.ChangeEvent<HTMLInputElement>) {
+    setAddressLineOne(event.target.value);
+  }
+
+  function handlePostcodeChange(event: React.ChangeEvent<HTMLInputElement>) {
+    setPostcode(event.target.value);
+  }
+
+  function handleUprnChange(event: React.ChangeEvent<HTMLInputElement>) {
+    setUprn(event.target.value);
+  }
+
+  function handleValuationChange(event: React.ChangeEvent<HTMLInputElement>) {
+    setValuation(event.target.value);
+  }
+
+  useEffect(() => {
+    function handleButtonDisabled(): boolean {
+      return !(
+        scenario &&
+        selectedGoal &&
+        housingType &&
+        addressLineOne &&
+        postcode &&
+        uprn &&
+        valuation
+      ); 
+    }
+
+    setButtonDisabled(handleButtonDisabled());
+  }, [scenario, selectedGoal, housingType, addressLineOne, postcode, uprn, valuation]);
+
+  return (
+    <>
+      <Transition appear show={isOpen} as={Fragment}>
+        <Dialog
+          as="div"
+          className="relative z-10"
+          onClose={() => setIsOpen(false)}
+        >
+          <Transition.Child
+            as={Fragment}
+            enter="ease-out duration-300"
+            enterFrom="opacity-0"
+            enterTo="opacity-100"
+            leave="ease-in duration-200"
+            leaveFrom="opacity-100"
+            leaveTo="opacity-0"
+          >
+            <div className="fixed inset-0 bg-black bg-opacity-25" />
+          </Transition.Child>
+
+          <div className="fixed inset-0 overflow-y-auto">
+            <div className="flex min-h-full items-center justify-center p-4 text-center">
+              <Transition.Child
+                as={Fragment}
+                enter="ease-out duration-300"
+                enterFrom="opacity-0 scale-95"
+                enterTo="opacity-100 scale-100"
+                leave="ease-in duration-200"
+                leaveFrom="opacity-100 scale-100"
+                leaveTo="opacity-0 scale-95"
+              >
+                <Dialog.Panel className="w-1/2 max-w-screen-md transform overflow-hidden rounded-2xl bg-white p-6 text-left align-middle shadow-xl transition-all">
+                  <Dialog.Title
+                    as="h3"
+                    className="text-lg font-medium leading-6 text-brandblue mb-3">
+                    {scenario} 
+                  </Dialog.Title>
+                  <div className="flex justify-center">
+                    Scenario Name
+                    <Input type="text" defaultValue={"Remote Assesment"} onChange={handleScenarioChange}/>
+                  </div>
+                  <div className="flex flex-col mt-6">
+                    <label
+                      htmlFor="portfolio-name"
+                      className="text-sm font-semibold text-gray-600 mb-1 relative leading-relaxed tracking-wider"
+                    >
+                      Housing type
+                      <span className="text-red-500">*</span>
+                    </label>
+                    <SelectDropdown
+                      options={selecthousingTypeOptions}
+                      selectedOption={housingType}
+                      onSelectOption={(option) => sethousingType(option.value)}
+                    />
+                  </div>
+                  <div className="flex flex-col mt-6">
+                    <label
+                      htmlFor="portfolio-name"
+                      className="text-sm font-semibold text-gray-600 mb-1 relative leading-relaxed tracking-wider"
+                    >
+                      Select Goal
+                      <span className="text-red-500">*</span>
+                    </label>
+                    <SelectDropdown
+                      options={selectGoalOptions}
+                      selectedOption={selectedGoal}
+                      onSelectOption={(option) => setSelectedGoal(option.value)}
+                    />
+                    {selectedGoal === "Increase EPC" && (
+                      <div className="flex flex-col mt-6">
+                        <label
+                          htmlFor="csv-upload-epc"
+                          className="text-sm font-semibold text-gray-600 relative leading-relaxed tracking-wider"
+                        >
+                          Choose a target EPC value
+                          <span className="text-red-500">*</span>
+                        </label>
+                        <SelectDropdown
+                          options={goalValueOptions}
+                          selectedOption={goalValue}
+                          onSelectOption={(option) => {
+                            setGoalValue(option.value);
+                          }}
+                        />
+                      </div>
+                    )}
+                  </div>
+                  <div className="flex justify-center mt-6">
+                    Address Line 1
+                    <Input type="text" onChange={handleAddressLineOneChange}/>
+                  </div>
+                  <div className="flex justify-center mt-6">
+                    Postcode 
+                    <Input type="text" onChange={handlePostcodeChange}/>
+                  </div>
+                  <div className="flex justify-center mt-6">
+                    UPRN 
+                    <Input type="text" onChange={handleUprnChange}/>
+                  </div>
+                  <div className="flex justify-center mt-6">
+                    Valuation 
+                    <Input type="text" onChange={handleValuationChange}/>
+                  </div>
+                  <div className="flex justify-center mt-6">
+                    <Button
+                      disabled={buttonDisabled}
+                      
+                      onClick={() => {
+                        console.log("making a submission")
+                        setIsOpen(false);
+                      }}
+                    >
+                      Submit
+                    </Button>
+                  </div>
+                  <button
+                        type="button"
+                        className="inline-flex justify-center rounded-md border border-transparent bg-blue-100 px-4 py-2 text-sm font-medium text-blue-900 hover:bg-blue-200 focus:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 focus-visible:ring-offset-2"
+                        onClick={() => setIsOpen(false)}
+                  
+                      >
+                        Cancel
+                  </button>
+                </Dialog.Panel>
+              </Transition.Child>
+            </div>
+          </div>
+        </Dialog>
+      </Transition>
+    </>
+  );
+}
+
diff --git a/src/app/portfolio/[slug]/components/UploadCsvModal.tsx b/src/app/portfolio/[slug]/components/UploadCsvModal.tsx
index a046403..0ebae80 100644
--- a/src/app/portfolio/[slug]/components/UploadCsvModal.tsx
+++ b/src/app/portfolio/[slug]/components/UploadCsvModal.tsx
@@ -96,7 +96,7 @@ const selectGoalOptions = [
   {
     label: "Reduce energy consumption",
     value: "Reduce energy consumption",
-    disabled: true,
+    disabled: false,
   },
 ];
 
@@ -272,7 +272,7 @@ export default function UploadCsvModal({
                         );
                       }}
                     />
-                    {selectedGoal && (
+                    {selectedGoal === "Increase EPC" && (
                       <div className="flex flex-col mt-6">
                         <label
                           htmlFor="csv-upload-epc"
diff --git a/src/app/shadcn_components/ui/form.tsx b/src/app/shadcn_components/ui/form.tsx
new file mode 100644
index 0000000..895f6e8
--- /dev/null
+++ b/src/app/shadcn_components/ui/form.tsx
@@ -0,0 +1,178 @@
+"use client"
+
+import * as React from "react"
+import * as LabelPrimitive from "@radix-ui/react-label"
+import { Slot } from "@radix-ui/react-slot"
+import {
+  Controller,
+  ControllerProps,
+  FieldPath,
+  FieldValues,
+  FormProvider,
+  useFormContext,
+} from "react-hook-form"
+
+import { cn } from "@/lib/utils"
+import { Label } from "@/app/shadcn_components/ui/label"
+
+const Form = FormProvider
+
+type FormFieldContextValue<
+  TFieldValues extends FieldValues = FieldValues,
+  TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>
+> = {
+  name: TName
+}
+
+const FormFieldContext = React.createContext<FormFieldContextValue>(
+  {} as FormFieldContextValue
+)
+
+const FormField = <
+  TFieldValues extends FieldValues = FieldValues,
+  TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>
+>({
+  ...props
+}: ControllerProps<TFieldValues, TName>) => {
+  return (
+    <FormFieldContext.Provider value={{ name: props.name }}>
+      <Controller {...props} />
+    </FormFieldContext.Provider>
+  )
+}
+
+const useFormField = () => {
+  const fieldContext = React.useContext(FormFieldContext)
+  const itemContext = React.useContext(FormItemContext)
+  const { getFieldState, formState } = useFormContext()
+
+  const fieldState = getFieldState(fieldContext.name, formState)
+
+  if (!fieldContext) {
+    throw new Error("useFormField should be used within <FormField>")
+  }
+
+  const { id } = itemContext
+
+  return {
+    id,
+    name: fieldContext.name,
+    formItemId: `${id}-form-item`,
+    formDescriptionId: `${id}-form-item-description`,
+    formMessageId: `${id}-form-item-message`,
+    ...fieldState,
+  }
+}
+
+type FormItemContextValue = {
+  id: string
+}
+
+const FormItemContext = React.createContext<FormItemContextValue>(
+  {} as FormItemContextValue
+)
+
+const FormItem = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => {
+  const id = React.useId()
+
+  return (
+    <FormItemContext.Provider value={{ id }}>
+      <div ref={ref} className={cn("space-y-2", className)} {...props} />
+    </FormItemContext.Provider>
+  )
+})
+FormItem.displayName = "FormItem"
+
+const FormLabel = React.forwardRef<
+  React.ElementRef<typeof LabelPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root>
+>(({ className, ...props }, ref) => {
+  const { error, formItemId } = useFormField()
+
+  return (
+    <Label
+      ref={ref}
+      className={cn(error && "text-destructive", className)}
+      htmlFor={formItemId}
+      {...props}
+    />
+  )
+})
+FormLabel.displayName = "FormLabel"
+
+const FormControl = React.forwardRef<
+  React.ElementRef<typeof Slot>,
+  React.ComponentPropsWithoutRef<typeof Slot>
+>(({ ...props }, ref) => {
+  const { error, formItemId, formDescriptionId, formMessageId } = useFormField()
+
+  return (
+    <Slot
+      ref={ref}
+      id={formItemId}
+      aria-describedby={
+        !error
+          ? `${formDescriptionId}`
+          : `${formDescriptionId} ${formMessageId}`
+      }
+      aria-invalid={!!error}
+      {...props}
+    />
+  )
+})
+FormControl.displayName = "FormControl"
+
+const FormDescription = React.forwardRef<
+  HTMLParagraphElement,
+  React.HTMLAttributes<HTMLParagraphElement>
+>(({ className, ...props }, ref) => {
+  const { formDescriptionId } = useFormField()
+
+  return (
+    <p
+      ref={ref}
+      id={formDescriptionId}
+      className={cn("text-sm text-muted-foreground", className)}
+      {...props}
+    />
+  )
+})
+FormDescription.displayName = "FormDescription"
+
+const FormMessage = React.forwardRef<
+  HTMLParagraphElement,
+  React.HTMLAttributes<HTMLParagraphElement>
+>(({ className, children, ...props }, ref) => {
+  const { error, formMessageId } = useFormField()
+  const body = error ? String(error?.message) : children
+
+  if (!body) {
+    return null
+  }
+
+  return (
+    <p
+      ref={ref}
+      id={formMessageId}
+      className={cn("text-sm font-medium text-destructive", className)}
+      {...props}
+    >
+      {body}
+    </p>
+  )
+})
+FormMessage.displayName = "FormMessage"
+
+export {
+  useFormField,
+  Form,
+  FormItem,
+  FormLabel,
+  FormControl,
+  FormDescription,
+  FormMessage,
+  FormField,
+}
diff --git a/src/app/shadcn_components/ui/label.tsx b/src/app/shadcn_components/ui/label.tsx
index 5341821..8d52d92 100644
--- a/src/app/shadcn_components/ui/label.tsx
+++ b/src/app/shadcn_components/ui/label.tsx
@@ -24,3 +24,4 @@ const Label = React.forwardRef<
 Label.displayName = LabelPrimitive.Root.displayName
 
 export { Label }
+