diff --git a/src/app/dashboard/lenses/actions/lens.action.tsx b/src/actions/lens.action.tsx
similarity index 100%
rename from src/app/dashboard/lenses/actions/lens.action.tsx
rename to src/actions/lens.action.tsx
diff --git a/src/app/dashboard/lenses/actions/lens.schema.tsx b/src/actions/lens.schema.tsx
similarity index 100%
rename from src/app/dashboard/lenses/actions/lens.schema.tsx
rename to src/actions/lens.schema.tsx
diff --git a/src/app/dashboard/profiles/actions/profile.action.tsx b/src/actions/profile.action.tsx
similarity index 100%
rename from src/app/dashboard/profiles/actions/profile.action.tsx
rename to src/actions/profile.action.tsx
diff --git a/src/app/dashboard/profiles/actions/profile.schema.tsx b/src/actions/profile.schema.tsx
similarity index 100%
rename from src/app/dashboard/profiles/actions/profile.schema.tsx
rename to src/actions/profile.schema.tsx
diff --git a/src/app/dashboard/lenses/[id]/page.tsx b/src/app/dashboard/lenses/[id]/page.tsx
index 1a7af720..8a8ca46f 100644
--- a/src/app/dashboard/lenses/[id]/page.tsx
+++ b/src/app/dashboard/lenses/[id]/page.tsx
@@ -18,8 +18,8 @@ import {
 import { Separator } from '@/components/ui/separator'
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
 import DateFormat from '@/components/date-format'
-import { ActionsDropdown } from './components/actions-dropdown'
-import { PublishButton } from './components/publish-button'
+import { ActionsDropdown } from '@/components/lenses/actions-dropdown'
+import { PublishButton } from '@/components/lenses/publish-button'
 
 export type PageProps = {
   params: { id: string }
@@ -31,10 +31,7 @@ export default async function Page({ params }: PageProps) {
   return (
     <>
       <SubNav>
-        <SubNavTitle>
-          {lens?.name}
-          <SubNavSubtitle>{lens?.description}</SubNavSubtitle>
-        </SubNavTitle>
+        <SubNavTitle>{lens?.name}</SubNavTitle>
         <SubNavActions>
           {lens?.isDraft && <PublishButton lensId={lens.id} />}
           <ActionsDropdown lens={lens} />
diff --git a/src/app/dashboard/lenses/new/page.tsx b/src/app/dashboard/lenses/new/page.tsx
index f08bdc7d..246717f2 100644
--- a/src/app/dashboard/lenses/new/page.tsx
+++ b/src/app/dashboard/lenses/new/page.tsx
@@ -1,6 +1,6 @@
 import { SubNav, SubNavTitle, SubNavSubtitle } from '@/components/sub-nav'
 import { Section } from '@/components/section'
-import { NewSolutionForm } from './components/new-form'
+import { NewSolutionForm } from '@/components/lenses/new-form'
 
 export default function Page() {
   return (
@@ -8,7 +8,9 @@ export default function Page() {
       <SubNav>
         <SubNavTitle>
           New Lens
-          <SubNavSubtitle>Lenses help to evalute workloads.</SubNavSubtitle>
+          <SubNavSubtitle>
+            Measure workloads against best practices.
+          </SubNavSubtitle>
         </SubNavTitle>
       </SubNav>
       <Section>
diff --git a/src/app/dashboard/lenses/page.tsx b/src/app/dashboard/lenses/page.tsx
index 940b1620..42f22a21 100644
--- a/src/app/dashboard/lenses/page.tsx
+++ b/src/app/dashboard/lenses/page.tsx
@@ -1,4 +1,4 @@
-import { AddLensButton } from './components/add-button'
+import { AddLensButton } from '@/components/lenses/add-button'
 import {
   SubNav,
   SubNavTitle,
@@ -6,7 +6,7 @@ import {
   SubNavSubtitle
 } from '@/components/sub-nav'
 import { Main } from '@/components/main'
-import { LensesDataTable } from './components/data-table'
+import { LensesDataTable } from '@/components/lenses/data-table'
 
 export default function Lenses() {
   return (
@@ -14,7 +14,9 @@ export default function Lenses() {
       <SubNav>
         <SubNavTitle>
           Lenses
-          <SubNavSubtitle>Review specifications for workloads</SubNavSubtitle>
+          <SubNavSubtitle>
+            Measure any architecture against best practices.
+          </SubNavSubtitle>
         </SubNavTitle>
         <SubNavActions>
           <AddLensButton />
diff --git a/src/app/dashboard/profiles/[id]/components/actions-dropdown.tsx b/src/app/dashboard/profiles/[id]/components/actions-dropdown.tsx
index d0878710..0b044c79 100644
--- a/src/app/dashboard/profiles/[id]/components/actions-dropdown.tsx
+++ b/src/app/dashboard/profiles/[id]/components/actions-dropdown.tsx
@@ -12,7 +12,7 @@ import {
 import { useRouter } from 'next/navigation'
 import type { Profile } from '@/db/models/profile'
 import { useAction } from '@/trpc/client'
-import { rhfActionDeleteProfile } from '@/app/dashboard/profiles/actions/profile.action'
+import { rhfActionDeleteProfile } from '@/actions/profile.action'
 
 interface ActionsDropdownProps {
   profile?: Profile | null
diff --git a/src/app/dashboard/profiles/[id]/components/publish-button.tsx b/src/app/dashboard/profiles/[id]/components/publish-button.tsx
index c2805c73..dfd54c85 100644
--- a/src/app/dashboard/profiles/[id]/components/publish-button.tsx
+++ b/src/app/dashboard/profiles/[id]/components/publish-button.tsx
@@ -2,7 +2,7 @@
 
 import { Button } from '@/components/ui/button'
 import { useAction } from '@/trpc/client'
-import { rhfActionPushlishLens } from '@/app/dashboard/lenses/actions/lens.action'
+import { rhfActionPushlishLens } from '@/actions/lens.action'
 
 interface PublishButtonProps {
   lensId: string
diff --git a/src/app/dashboard/profiles/new/page.tsx b/src/app/dashboard/profiles/new/page.tsx
index 501047da..61211c83 100644
--- a/src/app/dashboard/profiles/new/page.tsx
+++ b/src/app/dashboard/profiles/new/page.tsx
@@ -1,4 +1,4 @@
-import { Suspense, use, useDeferredValue } from 'react'
+import { Suspense } from 'react'
 import { SubNav, SubNavTitle, SubNavSubtitle } from '@/components/sub-nav'
 import { Section } from '@/components/section'
 import { NewProfileForm } from '@/components/dashboard/profiles/new-form'
diff --git a/src/app/dashboard/profiles/page.tsx b/src/app/dashboard/profiles/page.tsx
index 4d227b8f..83f1f2ad 100644
--- a/src/app/dashboard/profiles/page.tsx
+++ b/src/app/dashboard/profiles/page.tsx
@@ -6,7 +6,7 @@ import {
 } from '@/components/sub-nav'
 import { Main } from '@/components/main'
 import { AddProfileButton } from '@/components/dashboard/profiles/add-button'
-import { ProfileDataTable } from '@/components/dashboard/profiles/data-table'
+import { ProfilesDataTable } from '@/components/dashboard/profiles/data-table'
 
 export default function Page() {
   return (
@@ -14,16 +14,14 @@ export default function Page() {
       <SubNav>
         <SubNavTitle>
           <p>Profiles</p>
-          <SubNavSubtitle>
-            Provide business context for a workload
-          </SubNavSubtitle>
+          <SubNavSubtitle>Business context of a workload.</SubNavSubtitle>
         </SubNavTitle>
         <SubNavActions>
           <AddProfileButton />
         </SubNavActions>
       </SubNav>
       <Main>
-        <ProfileDataTable />
+        <ProfilesDataTable />
       </Main>
     </>
   )
diff --git a/src/app/dashboard/workloads/new/components/new-form.schema.tsx b/src/app/dashboard/workloads/new/components/new-form.schema.tsx
index 884a2e04..31eb4b76 100644
--- a/src/app/dashboard/workloads/new/components/new-form.schema.tsx
+++ b/src/app/dashboard/workloads/new/components/new-form.schema.tsx
@@ -3,7 +3,7 @@ import { z } from 'zod'
 export const rhfActionSchema = z.object({
   name: z.string().min(3, {}).default(''),
   lensesIds: z.array(z.string().uuid()).min(1).default([]),
-  environmentsIds: z.array(z.bigint()).min(1).default([]),
+  environmentsIds: z.array(z.coerce.bigint()).min(1).default([]),
   description: z
     .string()
     .min(10, {
diff --git a/src/components/dashboard/profiles/data-columns.tsx b/src/components/dashboard/profiles/data-columns.tsx
index 3234a82d..daf01c27 100644
--- a/src/components/dashboard/profiles/data-columns.tsx
+++ b/src/components/dashboard/profiles/data-columns.tsx
@@ -4,7 +4,7 @@ import { ColumnDef } from '@tanstack/react-table'
 import { Checkbox } from '@/components/ui/checkbox'
 import { Profile } from '@/db/models/profile'
 import { DataTableColumnHeader } from '@/components/data-table-column-header'
-import { DataTableRowActions } from '@/components/data-table-row-actions'
+import { DataTableRowActions } from './data-rows-actions'
 import Link from 'next/link'
 
 export const columns: ColumnDef<Profile>[] = [
diff --git a/src/components/dashboard/profiles/data-rows-actions.tsx b/src/components/dashboard/profiles/data-rows-actions.tsx
index 186bfbba..547714dc 100644
--- a/src/components/dashboard/profiles/data-rows-actions.tsx
+++ b/src/components/dashboard/profiles/data-rows-actions.tsx
@@ -2,7 +2,6 @@
 
 import { DotsHorizontalIcon } from '@radix-ui/react-icons'
 import { Row } from '@tanstack/react-table'
-
 import { Button } from '@/components/ui/button'
 import { api } from '@/trpc/client'
 import {
@@ -11,9 +10,6 @@ import {
   DropdownMenuItem,
   DropdownMenuSeparator,
   DropdownMenuShortcut,
-  DropdownMenuSub,
-  DropdownMenuSubContent,
-  DropdownMenuSubTrigger,
   DropdownMenuTrigger
 } from '@/components/ui/dropdown-menu'
 import Link from 'next/link'
@@ -43,24 +39,10 @@ export function DataTableRowActions<TData>({
         </Button>
       </DropdownMenuTrigger>
       <DropdownMenuContent align="end" className="w-[160px]">
-        <Link href={`/dashboard/workloads/${id}`}>
+        <Link href={`/dashboard/profiles/${id}`}>
           <DropdownMenuItem>View</DropdownMenuItem>
         </Link>
         <DropdownMenuItem>Make a copy</DropdownMenuItem>
-        <DropdownMenuItem>Favorite</DropdownMenuItem>
-        <DropdownMenuSeparator />
-        <DropdownMenuSub>
-          <DropdownMenuSubTrigger>Labels</DropdownMenuSubTrigger>
-          <DropdownMenuSubContent>
-            {/* <DropdownMenuRadioGroup value={}>
-              {labels.map(label => (
-                <DropdownMenuRadioItem key={label.value} value={label.value}>
-                  {label.label}
-                </DropdownMenuRadioItem>
-              ))}
-            </DropdownMenuRadioGroup> */}
-          </DropdownMenuSubContent>
-        </DropdownMenuSub>
         <DropdownMenuSeparator />
         <DropdownMenuItem onClick={() => deleteWorkload(id)}>
           Delete
diff --git a/src/components/dashboard/profiles/data-table.tsx b/src/components/dashboard/profiles/data-table.tsx
index 3f3d8e0e..6bcd2c97 100644
--- a/src/components/dashboard/profiles/data-table.tsx
+++ b/src/components/dashboard/profiles/data-table.tsx
@@ -5,13 +5,13 @@ import { DataTable } from '@/components/data-table'
 import { useQuery } from '@/lib/api'
 import { api } from '@/trpc/client'
 
-export function ProfileDataTable() {
+export function ProfilesDataTable() {
   const query = useQuery(({ pageIndex: offset, pageSize: limit }) =>
     api.profiles.list.query({ offset, limit })
   )
 
   return (
-    <div className="hidden h-full flex-1 flex-col space-y-8 p-8 md:flex">
+    <div className="h-full flex-1 flex-col space-y-8 p-8 md:flex">
       <DataTable columns={columns} query={query()} />
     </div>
   )
diff --git a/src/components/fancy-multi-select.tsx b/src/components/fancy-multi-select.tsx
index 3e301690..7412df59 100644
--- a/src/components/fancy-multi-select.tsx
+++ b/src/components/fancy-multi-select.tsx
@@ -1,8 +1,7 @@
 'use client'
 
-import * as React from 'react'
+import { useEffect, useCallback, useState, useRef } from 'react'
 import { X } from 'lucide-react'
-
 import { Badge } from '@/components/ui/badge'
 import { Command, CommandGroup, CommandItem } from '@/components/ui/command'
 import { Command as CommandPrimitive } from 'cmdk'
@@ -24,29 +23,26 @@ export function FancyMultiSelect<T>({
   onValueChange,
   dataValues = []
 }: FancyMultiSelectProps<T>) {
-  const inputRef = React.useRef<HTMLInputElement>(null)
-  const [open, setOpen] = React.useState(false)
-  const [selected, setSelected] = React.useState<FancyMultiSelectValue<T>[]>([
+  const inputRef = useRef<HTMLInputElement>(null)
+  const [open, setOpen] = useState(false)
+  const [selected, setSelected] = useState<FancyMultiSelectValue<T>[]>([
     dataValues[0]
   ])
-  const [inputValue, setInputValue] = React.useState('')
+  const [inputValue, setInputValue] = useState('')
 
-  React.useEffect(() => {
+  useEffect(() => {
     onValueChange?.(selected.map(s => s.value))
   }, [selected, onValueChange])
 
-  const handleSelect = React.useCallback((value: FancyMultiSelectValue<T>) => {
+  const handleSelect = useCallback((value: FancyMultiSelectValue<T>) => {
     setSelected(prev => [...prev, value])
   }, [])
 
-  const handleUnselect = React.useCallback(
-    (select: FancyMultiSelectValue<T>) => {
-      setSelected(prev => prev.filter(s => s.value !== select.value))
-    },
-    []
-  )
+  const handleUnselect = useCallback((select: FancyMultiSelectValue<T>) => {
+    setSelected(prev => prev.filter(s => s.value !== select.value))
+  }, [])
 
-  const handleKeyDown = React.useCallback(
+  const handleKeyDown = useCallback(
     (e: React.KeyboardEvent<HTMLDivElement>) => {
       const input = inputRef.current
       if (input) {
diff --git a/src/app/dashboard/lenses/[id]/components/actions-dropdown.tsx b/src/components/lenses/actions-dropdown.tsx
similarity index 94%
rename from src/app/dashboard/lenses/[id]/components/actions-dropdown.tsx
rename to src/components/lenses/actions-dropdown.tsx
index fddce44e..9a63c9d5 100644
--- a/src/app/dashboard/lenses/[id]/components/actions-dropdown.tsx
+++ b/src/components/lenses/actions-dropdown.tsx
@@ -12,7 +12,7 @@ import {
 import { useRouter } from 'next/navigation'
 import { Lens } from '@/db/models/lens'
 import { useAction } from '@/trpc/client'
-import { rhfActionDeleteLens } from '@/app/dashboard/lenses/actions/lens.action'
+import { rhfActionDeleteLens } from '@/actions/lens.action'
 
 interface ActionsDropdownProps {
   lens?: Lens | null
diff --git a/src/app/dashboard/lenses/components/add-button.tsx b/src/components/lenses/add-button.tsx
similarity index 100%
rename from src/app/dashboard/lenses/components/add-button.tsx
rename to src/components/lenses/add-button.tsx
diff --git a/src/app/dashboard/lenses/components/data-columns.tsx b/src/components/lenses/data-columns.tsx
similarity index 96%
rename from src/app/dashboard/lenses/components/data-columns.tsx
rename to src/components/lenses/data-columns.tsx
index cd7f1184..2704add3 100644
--- a/src/app/dashboard/lenses/components/data-columns.tsx
+++ b/src/components/lenses/data-columns.tsx
@@ -4,7 +4,7 @@ import { ColumnDef } from '@tanstack/react-table'
 import { Checkbox } from '@/components/ui/checkbox'
 import { Lens } from '@/db/models/lens'
 import { DataTableColumnHeader } from '@/components/data-table-column-header'
-import { DataTableRowActions } from '@/app/dashboard/lenses/components/data-rows-actions'
+import { DataTableRowActions } from '@/components/lenses/data-rows-actions'
 import { buttonVariants } from '@/components/ui/button'
 import { cn } from '@/lib/utils'
 import Link from 'next/link'
@@ -87,6 +87,7 @@ export const columns: ColumnDef<Lens>[] = [
       <DataTableColumnHeader column={column} title="Status" />
     ),
     cell: ({ row }) => {
+      console.log(row)
       return (
         <div className="flex space-x-2">
           <span className="max-w-[500px] truncate font-medium">
diff --git a/src/app/dashboard/lenses/components/data-rows-actions.tsx b/src/components/lenses/data-rows-actions.tsx
similarity index 69%
rename from src/app/dashboard/lenses/components/data-rows-actions.tsx
rename to src/components/lenses/data-rows-actions.tsx
index 3c965a35..e0fa6f5f 100644
--- a/src/app/dashboard/lenses/components/data-rows-actions.tsx
+++ b/src/components/lenses/data-rows-actions.tsx
@@ -16,7 +16,7 @@ import {
 } from '@/components/ui/dropdown-menu'
 import Link from 'next/link'
 import { useAction } from '@/trpc/client'
-import { rhfActionDeleteLens } from '../actions/lens.action'
+import { rhfActionDeleteLens } from '@/actions/lens.action'
 
 interface DataTableRowActionsProps<TData> {
   row: Row<TData>
@@ -46,21 +46,6 @@ export function DataTableRowActions<TData>({
         <Link href={`/dashboard/lenses/${id}`} passHref>
           <DropdownMenuItem>View</DropdownMenuItem>
         </Link>
-        <DropdownMenuItem>Make a copy</DropdownMenuItem>
-        <DropdownMenuItem>Favorite</DropdownMenuItem>
-        <DropdownMenuSeparator />
-        <DropdownMenuSub>
-          <DropdownMenuSubTrigger>Labels</DropdownMenuSubTrigger>
-          <DropdownMenuSubContent>
-            {/* <DropdownMenuRadioGroup value={}>
-              {labels.map(label => (
-                <DropdownMenuRadioItem key={label.value} value={label.value}>
-                  {label.label}
-                </DropdownMenuRadioItem>
-              ))}
-            </DropdownMenuRadioGroup> */}
-          </DropdownMenuSubContent>
-        </DropdownMenuSub>
         <DropdownMenuSeparator />
         <DropdownMenuItem onClick={() => deleteLens(id)}>
           Delete
diff --git a/src/app/dashboard/lenses/components/data-table.tsx b/src/components/lenses/data-table.tsx
similarity index 80%
rename from src/app/dashboard/lenses/components/data-table.tsx
rename to src/components/lenses/data-table.tsx
index fe7136de..34395185 100644
--- a/src/app/dashboard/lenses/components/data-table.tsx
+++ b/src/components/lenses/data-table.tsx
@@ -2,7 +2,6 @@
 
 import { columns } from './data-columns'
 import { DataTable } from '@/components/data-table'
-import type { Lens } from '@/db/models/lens'
 import { useQuery } from '@/lib/api'
 import { api } from '@/trpc/client'
 
@@ -13,7 +12,7 @@ export function LensesDataTable() {
 
   return (
     <div className="hidden h-full flex-1 flex-col space-y-8 p-8 md:flex">
-      <DataTable<Lens> columns={columns} query={query()} />
+      <DataTable columns={columns} query={query()} />
     </div>
   )
 }
diff --git a/src/app/dashboard/lenses/new/components/new-form.action.tsx b/src/components/lenses/new-form.action.tsx
similarity index 88%
rename from src/app/dashboard/lenses/new/components/new-form.action.tsx
rename to src/components/lenses/new-form.action.tsx
index 667597f8..bff18b57 100644
--- a/src/app/dashboard/lenses/new/components/new-form.action.tsx
+++ b/src/components/lenses/new-form.action.tsx
@@ -4,13 +4,11 @@ import 'server-only'
 import { createAction, protectedProcedure } from '@/server/trpc'
 import { rhfActionSchema } from './new-form.schema'
 import { createLens } from '@/db/services/lenses'
-import { v4 as uuidv4 } from 'uuid'
 
 export const rhfAction = createAction(
   protectedProcedure.input(rhfActionSchema).mutation(
     async opts =>
       await createLens({
-        id: uuidv4(),
         name: opts.input.name,
         description: opts.input.description,
         spec: opts.input.spec
diff --git a/src/app/dashboard/lenses/new/components/new-form.schema.tsx b/src/components/lenses/new-form.schema.tsx
similarity index 100%
rename from src/app/dashboard/lenses/new/components/new-form.schema.tsx
rename to src/components/lenses/new-form.schema.tsx
diff --git a/src/app/dashboard/lenses/new/components/new-form.tsx b/src/components/lenses/new-form.tsx
similarity index 84%
rename from src/app/dashboard/lenses/new/components/new-form.tsx
rename to src/components/lenses/new-form.tsx
index c9035bfe..83ac8162 100644
--- a/src/app/dashboard/lenses/new/components/new-form.tsx
+++ b/src/components/lenses/new-form.tsx
@@ -9,8 +9,9 @@ import {
   FormMessage,
   FormField
 } from '@/components/ui/form'
+import type { PropsWithChildren } from 'react'
 import { Textarea } from '@/components/ui/textarea'
-import { useEffect } from 'react'
+import { useEffect, useMemo } from 'react'
 import { Input } from '@/components/ui/input'
 import { Button } from '@/components/ui/button'
 import { zodResolver } from '@hookform/resolvers/zod'
@@ -21,11 +22,11 @@ import { z } from 'zod'
 import { useAction } from '@/trpc/client'
 import { useRouter } from 'next/navigation'
 
-export type NewSolutionFormProps = {
-  className?: string
-}
+export type NewSolutionFormProps = {}
 
-export function NewSolutionForm({ ...props }: NewSolutionFormProps) {
+export function NewSolutionForm({
+  ...props
+}: PropsWithChildren<NewSolutionFormProps>) {
   const form = useForm<z.infer<typeof rhfActionSchema>>({
     resolver: zodResolver(rhfActionSchema),
     defaultValues: {
@@ -41,11 +42,16 @@ export function NewSolutionForm({ ...props }: NewSolutionFormProps) {
     await mutation.mutateAsync({ ...data })
   }
 
+  const isLoading = useMemo(
+    () => mutation.status === 'loading',
+    [mutation.status]
+  )
+
   useEffect(() => {
     if (mutation.status === 'success') {
       router.push(`/dashboard/lenses/${mutation.data?.id}`)
     }
-  })
+  }, [mutation.status, mutation.data?.id, router])
 
   const fileRef = form.register('spec', { required: true })
 
@@ -66,7 +72,7 @@ export function NewSolutionForm({ ...props }: NewSolutionFormProps) {
                   <h1>Name</h1>
                 </FormLabel>
                 <FormControl>
-                  <Input {...field} />
+                  <Input disabled={isLoading} {...field} />
                 </FormControl>
                 <FormDescription>Give it a great name.</FormDescription>
                 <FormMessage />
@@ -82,7 +88,7 @@ export function NewSolutionForm({ ...props }: NewSolutionFormProps) {
                 <FormControl>
                   <Input
                     type="file"
-                    disabled={form.formState.isSubmitting}
+                    disabled={isLoading}
                     placeholder=""
                     {...fileRef}
                   />
@@ -102,6 +108,7 @@ export function NewSolutionForm({ ...props }: NewSolutionFormProps) {
                 <FormControl>
                   <Textarea
                     {...field}
+                    disabled={isLoading}
                     className="w-full"
                     placeholder="Add a description ..."
                   />
@@ -111,10 +118,7 @@ export function NewSolutionForm({ ...props }: NewSolutionFormProps) {
               </div>
             )}
           />
-          <Button
-            type="submit"
-            disabled={form.formState.isSubmitting || !form.formState.isValid}
-          >
+          <Button type="submit" disabled={isLoading || !form.formState.isValid}>
             New Lens
           </Button>
         </form>
diff --git a/src/app/dashboard/lenses/[id]/components/publish-button.tsx b/src/components/lenses/publish-button.tsx
similarity index 86%
rename from src/app/dashboard/lenses/[id]/components/publish-button.tsx
rename to src/components/lenses/publish-button.tsx
index c2805c73..dfd54c85 100644
--- a/src/app/dashboard/lenses/[id]/components/publish-button.tsx
+++ b/src/components/lenses/publish-button.tsx
@@ -2,7 +2,7 @@
 
 import { Button } from '@/components/ui/button'
 import { useAction } from '@/trpc/client'
-import { rhfActionPushlishLens } from '@/app/dashboard/lenses/actions/lens.action'
+import { rhfActionPushlishLens } from '@/actions/lens.action'
 
 interface PublishButtonProps {
   lensId: string
diff --git a/src/db/models/lens.ts b/src/db/models/lens.ts
index 8c7cc51b..52f1b437 100644
--- a/src/db/models/lens.ts
+++ b/src/db/models/lens.ts
@@ -11,7 +11,8 @@ import {
   Min,
   Max,
   HasMany,
-  Default
+  Default,
+  AllowNull
 } from 'sequelize-typescript'
 import { LensPillar } from './lens-pillars'
 import type { Spec } from '../schemas/spec'
@@ -31,7 +32,7 @@ export interface LensAttributes {
 
 export type LensCreationAttributes = Omit<
   LensAttributes,
-  'createdAt' | 'updatedAt' | 'deletedAt'
+  'id' | 'createdAt' | 'updatedAt' | 'deletedAt'
 >
 
 @Table({
@@ -40,6 +41,8 @@ export type LensCreationAttributes = Omit<
 })
 export class Lens extends Model<LensAttributes, LensCreationAttributes> {
   @PrimaryKey
+  @AllowNull(false)
+  @Default(DataType.UUIDV4)
   @Column(DataType.UUIDV4)
   id!: string
 
@@ -59,7 +62,7 @@ export class Lens extends Model<LensAttributes, LensCreationAttributes> {
 
   @Default(true)
   @Column
-  isDraft!: boolean
+  isDraft?: boolean
 
   @NotEmpty
   @Min(12)
diff --git a/src/db/models/profile.ts b/src/db/models/profile.ts
index a5afff17..59adcab8 100644
--- a/src/db/models/profile.ts
+++ b/src/db/models/profile.ts
@@ -10,7 +10,9 @@ import {
   NotEmpty,
   Min,
   Max,
-  BelongsToMany
+  BelongsToMany,
+  AllowNull,
+  Default
 } from 'sequelize-typescript'
 import { ProfileQuestionAnswer } from '@/db/models/profile-question-answers'
 import { ProfileQuestionChoice } from '@/db/models/profile-question-choice'
@@ -26,7 +28,7 @@ export interface ProfileAttributes {
 
 export type ProfileCreationAttributes = Omit<
   ProfileAttributes,
-  'createdAt' | 'updatedAt' | 'deletedAt'
+  'id' | 'createdAt' | 'updatedAt' | 'deletedAt'
 >
 
 @Table({
@@ -38,6 +40,8 @@ export class Profile extends Model<
   ProfileCreationAttributes
 > {
   @PrimaryKey
+  @Default(DataType.UUIDV4)
+  @AllowNull(false)
   @Column(DataType.UUIDV4)
   id!: string
 
diff --git a/src/db/schemas/lenses.ts b/src/db/schemas/lenses.ts
index 731cdbe2..c811e93e 100644
--- a/src/db/schemas/lenses.ts
+++ b/src/db/schemas/lenses.ts
@@ -4,3 +4,8 @@ export const LensesGetSchema = z.string().uuid()
 export const LensesDeleteSchema = z.string().uuid()
 export const LensesPublishSchema = z.string().uuid()
 export const LensesGetQuestionSchema = z.string()
+export const LensesAddSchema = z.object({
+  name: z.string().min(1).max(256),
+  description: z.string().min(10).max(2048),
+  spec: z.string()
+})
diff --git a/src/db/schemas/profiles.ts b/src/db/schemas/profiles.ts
index becf09d5..ac58b865 100644
--- a/src/db/schemas/profiles.ts
+++ b/src/db/schemas/profiles.ts
@@ -12,3 +12,4 @@ export const CreateProfileSchema = z.object({
   description: z.string().min(3).max(255),
   selectedChoices: z.record(z.string(), z.array(z.string()).min(1))
 })
+export const MakeCopyProfileSchema = z.string().uuid()
diff --git a/src/db/services/lenses.ts b/src/db/services/lenses.ts
index d4b5382b..28136fda 100644
--- a/src/db/services/lenses.ts
+++ b/src/db/services/lenses.ts
@@ -9,11 +9,13 @@ import {
   LensesGetSchema,
   LensesDeleteSchema,
   LensesPublishSchema,
-  LensesGetQuestionSchema
+  LensesGetQuestionSchema,
+  LensesAddSchema
 } from '../schemas/lenses'
 import sequelize from '@/db/config/config'
 import { z } from 'zod'
 import { LensPillarResource } from '../models/lens-pillar-resources'
+import { MakeCopyProfileSchema } from '../schemas/profiles'
 
 export type Pagination = {
   offset?: number
@@ -34,27 +36,15 @@ export const deleteLens = async (opts: z.infer<typeof LensesDeleteSchema>) =>
 export const publishLens = async (opts: z.infer<typeof LensesPublishSchema>) =>
   await Lens.update({ isDraft: false }, { where: { id: opts } })
 
-export async function createLens({
-  id = uuidv4(),
-  name,
-  description,
-  spec
-}: {
-  id: string
-  name: string
-  description: string
-  spec: string
-}) {
-  return await sequelize.transaction(async transaction => {
-    const s = await Spec.parseAsync(JSON.parse(spec))
+export const createLens = async (opts: z.infer<typeof LensesAddSchema>) =>
+  await sequelize.transaction(async transaction => {
+    const spec = await Spec.parseAsync(JSON.parse(opts.spec))
 
     const lens = await Lens.create(
       {
-        id,
-        name,
-        version: s.version,
-        description,
-        spec: s,
+        ...opts,
+        version: spec.version,
+        spec: spec,
         isDraft: true
       },
       {
@@ -64,7 +54,7 @@ export async function createLens({
 
     const pillars = await LensPillar.bulkCreate(
       [
-        ...s.pillars.map(pillar => ({
+        ...spec.pillars.map(pillar => ({
           lensId: lens.id,
           name: pillar.name,
           ref: pillar.id,
@@ -80,7 +70,7 @@ export async function createLens({
 
     const pillarsResources = await LensPillarResource.bulkCreate(
       pillars.flatMap((pillar, idx) => [
-        ...(s.pillars[idx].resources?.map(resource => {
+        ...(spec.pillars[idx].resources?.map(resource => {
           return {
             pillarId: pillar.id,
             url: resource.url,
@@ -93,7 +83,7 @@ export async function createLens({
 
     const questions = await LensPillarQuestion.bulkCreate(
       pillars.flatMap((pillar, idx) => [
-        ...s.pillars[idx].questions.map(question => {
+        ...spec.pillars[idx].questions.map(question => {
           return {
             pillarId: pillar.id,
             ref: question.id,
@@ -108,7 +98,7 @@ export async function createLens({
     const questionResources = await LensPillarQuestionResource.bulkCreate(
       pillars.flatMap((pillar, a) => [
         ...questions.flatMap((question, b) => [
-          ...(s.pillars[a].questions[b]?.resources?.map(resource => {
+          ...(spec.pillars[a].questions[b]?.resources?.map(resource => {
             return {
               questionId: question.id,
               url: resource.url,
@@ -123,7 +113,7 @@ export async function createLens({
     const choices = await LensPillarChoice.bulkCreate(
       pillars.flatMap((pillar, a) => [
         ...questions.flatMap((question, b) => [
-          ...s.pillars[a].questions[b].choices.map(choice => {
+          ...spec.pillars[a].questions[b].choices.map(choice => {
             return {
               questionId: question.id,
               ref: choice.id,
@@ -137,7 +127,6 @@ export async function createLens({
 
     return { ...lens.dataValues }
   })
-}
 
 export const findOneLensPillarQuestion = async (
   opts: z.infer<typeof LensesGetQuestionSchema>
diff --git a/src/db/services/profiles.ts b/src/db/services/profiles.ts
index 6586c75e..277a4ca1 100644
--- a/src/db/services/profiles.ts
+++ b/src/db/services/profiles.ts
@@ -1,4 +1,3 @@
-import { v4 as uuidv4 } from 'uuid'
 import { Profile } from '@/db/models/profile'
 import { ProfileQuestion } from '@/db/models/profile-question'
 import { ProfileQuestionAnswer } from '@/db/models/profile-question-answers'
@@ -8,7 +7,8 @@ import {
   FindOneProfileSchema,
   CreateProfileSchema,
   FindAllProfilesQuestionsSchema,
-  DestroyProfileSchema
+  DestroyProfileSchema,
+  MakeCopyProfileSchema
 } from '../schemas/profiles'
 import { z } from 'zod'
 import sequelize from '@/db/config/config'
@@ -22,10 +22,7 @@ export const createProfile = async (
   opts: z.infer<typeof CreateProfileSchema>
 ) =>
   sequelize.transaction(async transaction => {
-    const profile = await Profile.create(
-      { id: uuidv4(), ...opts },
-      { transaction }
-    )
+    const profile = await Profile.create({ ...opts }, { transaction })
 
     await ProfileQuestionAnswer.bulkCreate(
       Object.values(opts.selectedChoices)
@@ -48,10 +45,6 @@ export const destroyProfile = async (
       await Profile.destroy({ where: { id: opts }, transaction })
   )
 
-// export async function deleteProfile(id: string) {
-//   return await Profile.destroy({ where: { id } })
-// }
-
 export const findOneProfile = async (
   opts: z.infer<typeof FindOneProfileSchema>
 ) =>
diff --git a/src/server/routers/_app.ts b/src/server/routers/_app.ts
index a56a260f..80b15243 100644
--- a/src/server/routers/_app.ts
+++ b/src/server/routers/_app.ts
@@ -7,7 +7,8 @@ import {
   listWorkloads,
   deleteWorkload,
   findWorkloadLensQuestion,
-  totalWorkloads
+  totalWorkloads,
+  workloadsRouter
 } from './actions/workloads'
 import { getProfile, listProfilesQuestions } from './actions/profiles'
 import { getLens, getLensQuestion } from './actions/lenses'
@@ -77,7 +78,10 @@ export const appRouter = router({
   solutions: solutionsRouter,
 
   // profiles
-  profiles: profilesRouter
+  profiles: profilesRouter,
+
+  // workloads
+  workloads: workloadsRouter
 })
 
 export type AppRouter = typeof appRouter
diff --git a/src/server/routers/actions/workloads.ts b/src/server/routers/actions/workloads.ts
index 5c245fb2..65339e76 100644
--- a/src/server/routers/actions/workloads.ts
+++ b/src/server/routers/actions/workloads.ts
@@ -1,7 +1,6 @@
 import { protectedProcedure } from '../../trpc'
 import {
   WorkloadGetSchema,
-  WorkloadGetQuestionSchema,
   WorkloadListSchema,
   WorkloadDeleteSchema,
   WorkloadGetLensQuestionSchema,
@@ -15,6 +14,7 @@ import {
   getWorkloadLensQuestion,
   countWorkloads
 } from '@/db/services/workloads'
+import { router } from '@/server/trpc'
 
 export const getWorkload = protectedProcedure
   .input(WorkloadGetSchema)
@@ -39,3 +39,9 @@ export const findWorkloadLensQuestion = protectedProcedure
 export const totalWorkloads = protectedProcedure.query(
   async _ => await countWorkloads()
 )
+
+export const workloadsRouter = router({
+  get: getWorkload,
+  list: listWorkloads,
+  delete: deleteWorkload
+})
diff --git a/src/server/routers/schemas/workload.ts b/src/server/routers/schemas/workload.ts
index decf0dad..f022f93a 100644
--- a/src/server/routers/schemas/workload.ts
+++ b/src/server/routers/schemas/workload.ts
@@ -10,7 +10,8 @@ export const WorkloadGetQuestionSchema = z.object({
 export const WorkloadListSchema = PaginationSchema
 export const WorkloadAddSchema = z.object({
   name: z.string().min(3).max(256),
-  description: z.string().min(10).max(2048)
+  description: z.string().min(10).max(2048),
+  spec: z.string()
 })
 export const WorkloadGetLensQuestionSchema = z.object({
   workloadId: z.string().uuid(),