diff --git a/.vscode/settings.json b/.vscode/settings.json
index a95220c..65a4f69 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -15,5 +15,8 @@
     "./web/src/pages",
     "./web/src/index.js",
     "./web/src/Routes.js",
+  ],
+  "cSpell.words": [
+    "Uploader"
   ]
 }
diff --git a/web/src/components/ImageUploader/ImageUploader.js b/web/src/components/ImageUploader/ImageUploader.js
new file mode 100644
index 0000000..39e78a4
--- /dev/null
+++ b/web/src/components/ImageUploader/ImageUploader.js
@@ -0,0 +1,121 @@
+import React, { useCallback, useState } from "react";
+import { useDropzone } from "react-dropzone";
+import Button from "@material-ui/core/Button";
+import axios from 'axios'
+import ReactCrop from 'react-image-crop'
+import { Dialog } from '@material-ui/core'
+import { Image as CloudinaryImage } from 'cloudinary-react'
+import 'react-image-crop/dist/ReactCrop.css'
+import Svg from 'src/components/Svg/Svg.js'
+
+const CLOUDINARY_UPLOAD_PRESET = "CadHub_project_images";
+const CLOUDINARY_UPLOAD_URL = "https://api.cloudinary.com/v1_1/irevdev/upload";
+
+export default function ImageUploader({ onImageUpload, imageUrl, aspectRatio, className, isEditable }) {
+  const [isModalOpen, setIsModalOpen] = useState(false)
+  const [file, setFile] = useState()
+  const [cloudinaryId, setCloudinaryId] = useState(imageUrl)
+  const [imageObj, setImageObj] = useState()
+  const [crop, setCrop] = useState({
+    aspect: aspectRatio,
+    unit: '%',
+    width: 100,
+  });
+  async function handleImageUpload() {
+    const croppedFile = await getCroppedImg(imageObj, crop, 'avatar')
+    console.log(croppedFile)
+    const imageData = new FormData();
+    imageData.append('upload_preset', CLOUDINARY_UPLOAD_PRESET);
+    imageData.append('file', croppedFile);
+    let upload = axios.post(CLOUDINARY_UPLOAD_URL, imageData)
+    try {
+      const { data } = await upload
+      if (data && data.public_id !== "") {
+        onImageUpload({cloudinaryPublicId: data.public_id})
+        setCloudinaryId(data.public_id)
+        setIsModalOpen(false)
+      }
+    } catch (e) {
+      console.error('ERROR', e)
+    }
+  }
+  // Drag and Drop
+  const onDrop = useCallback(acceptedFiles => {
+    setIsModalOpen(true)
+    const fileReader = new FileReader()
+    fileReader.onload = () => {
+      setFile(fileReader.result)
+    }
+    fileReader.readAsDataURL(acceptedFiles[0])
+  }, []);
+
+  const { getRootProps, getInputProps, isDragActive } = useDropzone({ onDrop });
+  return (
+    <div className={'relative border-dashed overflow-hidden border-indigo-500 '+ (!imageUrl ? 'border ' : '') + className} style={{paddingBottom: `${1/aspectRatio*100}%`}}>
+      <div className="absolute w-full h-full" {...getRootProps()}>
+        {cloudinaryId && isEditable && <button className="absolute z-10 w-full inset-0 bg-indigo-900 opacity-50 flex justify-center items-center">
+          <Svg name="pencil" strokeWidth={2} className="text-gray-300 h-48 w-48" />
+        </button>}
+        {isEditable && <input {...getInputProps()} />}
+        {(cloudinaryId || !isEditable) && <div className="relative overflow-hidden">
+          <CloudinaryImage
+            className="object-cover w-full h-full mt-px rounded shadow overflow-hidden"
+            cloudName="irevdev"
+            publicId={cloudinaryId || 'CadHub/eia1kwru54g2kf02s2xx'}
+            width="600"
+            crop="scale"
+          />
+        </div>}
+        {!cloudinaryId && <button className="absolute inset-0"></button>}
+        {!cloudinaryId && isEditable && <div className="text-indigo-500 flex items-center justify-center rounded-lg w-full h-full">
+          <div>
+            Drop files here ...
+            or <span className="group flex w-full items-center justify-center py-4">
+              <span className="bg-indigo-500 shadow rounded text-gray-200 cursor-pointer p-2 hover:shadow-lg transform hover:-translate-y-1 transition-all duration-150">upload</span>
+            </span>
+          </div>
+        </div>}
+      </div>
+      <Dialog
+        open={isModalOpen}
+        onClose={() => setIsModalOpen(false)}
+      >
+        <div className="p-4">
+          <ReactCrop src={file} crop={crop} onImageLoaded={(image) => setImageObj(image)} onChange={newCrop => setCrop(newCrop)} />
+          <Button onClick={handleImageUpload} variant="outlined">Upload</Button>
+        </div>
+      </Dialog>
+    </div>
+  );
+}
+
+function getCroppedImg(image, crop, fileName) {
+  const canvas = document.createElement('canvas');
+  const scaleX = image.naturalWidth / image.width;
+  const scaleY = image.naturalHeight / image.height;
+  canvas.width = crop.width;
+  canvas.height = crop.height;
+  const ctx = canvas.getContext('2d');
+  ctx.drawImage(
+    image,
+    crop.x * scaleX,
+    crop.y * scaleY,
+    crop.width * scaleX,
+    crop.height * scaleY,
+    0,
+    0,
+    crop.width,
+    crop.height
+  );
+
+  // As Base64 string
+  // const base64Image = canvas.toDataURL('image/jpeg');
+
+  // As a blob
+  return new Promise((resolve, reject) => {
+    canvas.toBlob(blob => {
+      blob.name = fileName;
+      resolve(blob);
+    }, 'image/jpeg', 1);
+  });
+}
diff --git a/web/src/components/ImageUploader/ImageUploader.stories.js b/web/src/components/ImageUploader/ImageUploader.stories.js
new file mode 100644
index 0000000..f5b9f65
--- /dev/null
+++ b/web/src/components/ImageUploader/ImageUploader.stories.js
@@ -0,0 +1,42 @@
+import ImageUploader from './ImageUploader'
+
+export const generated = () => {
+  return (
+    <>
+      <h3>AspectRatio:1, no initial image, editable</h3>
+      <
+        ImageUploader
+        onImageUpload={({cloudinaryPublicId}) => console.log(cloudinaryPublicId)}
+        aspectRatio={1}
+        isEditable={true}
+        className={"bg-red-400 rounded-half rounded-br-xl"}
+      />
+      <h3>AspectRatio 16:9, no initial image, editable</h3>
+      <
+        ImageUploader
+        onImageUpload={({cloudinaryPublicId}) => console.log(cloudinaryPublicId)}
+        aspectRatio={16/9}
+        isEditable={true}
+        className={"bg-red-400 rounded-xl"}
+        imageUrl="CadHub/inakek2urbreynblzhgt"
+      />
+      <h3>AspectRatio:1, no initial image, NOT editable</h3>
+      <
+        ImageUploader
+        onImageUpload={({cloudinaryPublicId}) => console.log(cloudinaryPublicId)}
+        aspectRatio={1}
+        className={"rounded-half rounded-br-xl"}
+      />
+      <h3>AspectRatio ,16:9 no initial image, NOT editable</h3>
+      <
+        ImageUploader
+        onImageUpload={({cloudinaryPublicId}) => console.log(cloudinaryPublicId)}
+        aspectRatio={16/9}
+        className={"rounded-xl"}
+        imageUrl="CadHub/inakek2urbreynblzhgt"
+      />
+    </>
+  )
+}
+
+export default { title: 'Components/ImageUploader' }
diff --git a/web/src/components/ImageUploader/ImageUploader.test.js b/web/src/components/ImageUploader/ImageUploader.test.js
new file mode 100644
index 0000000..1a05ab3
--- /dev/null
+++ b/web/src/components/ImageUploader/ImageUploader.test.js
@@ -0,0 +1,11 @@
+import { render } from '@redwoodjs/testing'
+
+import ImageUploader from './ImageUploader'
+
+describe('ImageUploader', () => {
+  it('renders successfully', () => {
+    expect(() => {
+      render(<ImageUploader />)
+    }).not.toThrow()
+  })
+})
diff --git a/web/tailwind.config.js b/web/tailwind.config.js
index c15b6f2..c49984b 100644
--- a/web/tailwind.config.js
+++ b/web/tailwind.config.js
@@ -22,6 +22,9 @@ module.exports = {
       },
       skew: {
         '-20': "-20deg"
+      },
+      borderRadius: {
+        half: '50%',
       }
     }
   },