diff --git a/frontend/public/index.html b/frontend/public/index.html
index c7c1060d..61a285e5 100644
--- a/frontend/public/index.html
+++ b/frontend/public/index.html
@@ -7,9 +7,9 @@
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
-      content="OpenContracts is an Apache2-licensed document annotation labelling and sharing platform designed to make it
-      easy to label pdfs and complex natural language documents. Based in part on Allen AI's PAWLs annotator, it's open,
-      extensible, and designed for teams and collaboration."
+      content="OpenContracts is an Apache2-licensed document analytics and sharing platform designed to make it
+      easy to query, analyze and label complex natural language documents. It's open, extensible, and designed for 
+      teams and collaboration."
     />
     <meta property="og:type" content="website" key="Type" />
     <meta
@@ -19,9 +19,9 @@
     />
     <meta
       property="og:description"
-      content="OpenContracts is an Apache2-licensed document annotation labelling and sharing platform designed to make it
-    easy to label pdfs and complex natural language documents. Based in part on Allen AI's PAWLs annotator, it's open,
-    extensible, and designed for teams and collaboration."
+      content="OpenContracts is an Apache2-licensed document analytics and sharing platform designed to make it
+      easy to query, analyze and label complex natural language documents. It's open, extensible, and designed for 
+      teams and collaboration."
       key="Description"
     />
     <meta
diff --git a/frontend/src/components/forms/schemas.ts b/frontend/src/components/forms/schemas.ts
index 0f2346db..247f8e13 100644
--- a/frontend/src/components/forms/schemas.ts
+++ b/frontend/src/components/forms/schemas.ts
@@ -112,7 +112,7 @@ export const editColumnForm_Schema = {
         "Use agentic retrieval of referenced sections and definitions in returned text.",
     },
   },
-  required: [],
+  required: ["name", "outputType"],
 };
 
 export const editColumnForm_Ui_Schema = {
diff --git a/frontend/src/components/widgets/CRUD/CRUDModal.tsx b/frontend/src/components/widgets/CRUD/CRUDModal.tsx
index 3468ee27..f9564afb 100644
--- a/frontend/src/components/widgets/CRUD/CRUDModal.tsx
+++ b/frontend/src/components/widgets/CRUD/CRUDModal.tsx
@@ -1,6 +1,6 @@
 import React, { ReactNode, useEffect, useState } from "react";
 import { Button, Modal, Icon } from "semantic-ui-react";
-import _ from "lodash";
+import _, { update } from "lodash";
 import { CRUDWidget } from "./CRUDWidget";
 import { CRUDProps, LooseObject } from "../../types";
 
@@ -47,17 +47,23 @@ export function CRUDModal({
 
   const can_write = mode !== "VIEW" && (mode === "CREATE" || mode === "EDIT");
 
-  // console.log("----------------------------")
-  // console.log("old_instance", old_instance);
-  // console.log("instance_obj", instance_obj);
+  console.log("---- CRUD MODAL ----");
+  console.log("old_instance", old_instance);
+  console.log("instance_obj", instance_obj);
+
+  useEffect(() => {
+    console.log("CRUD updated fields obj", updated_fields_obj);
+  }, [updated_fields_obj]);
 
   useEffect(() => {
     setInstanceObj(old_instance ? old_instance : {});
-    setUpdatedFields({ id: old_instance?.id ? old_instance.id : -1 });
+    if (old_instance.length >= 0 && old_instance.hasOwnProperty("id")) {
+      setUpdatedFields({ id: old_instance.id });
+    }
   }, [old_instance]);
 
   const handleModelChange = (updated_fields: LooseObject) => {
-    // console.log("HandleModelChange: ", updated_fields);
+    console.log("HandleModelChange: ", updated_fields);
     setInstanceObj((instance_obj) => ({ ...instance_obj, ...updated_fields }));
     setUpdatedFields((updated_fields_obj) => ({
       ...updated_fields_obj,
@@ -92,7 +98,13 @@ export function CRUDModal({
   }
 
   return (
-    <Modal size="large" closeIcon open={open} onClose={() => onClose()}>
+    <Modal
+      centered
+      size="large"
+      closeIcon
+      open={open}
+      onClose={() => onClose()}
+    >
       <Modal.Content scrolling>
         <CRUDWidget
           mode={mode}
@@ -118,9 +130,13 @@ export function CRUDModal({
           <Button
             color="green"
             inverted
-            onClick={() =>
-              onSubmit(mode === "EDIT" ? updated_fields_obj : instance_obj)
-            }
+            onClick={() => {
+              console.log(
+                "Submitting",
+                mode === "EDIT" ? updated_fields_obj : instance_obj
+              );
+              onSubmit(mode === "EDIT" ? updated_fields_obj : instance_obj);
+            }}
           >
             <Icon name="checkmark" /> {mode === "EDIT" ? "Update" : "Create"}
           </Button>
diff --git a/frontend/src/components/widgets/modals/CreateColumnModal.tsx b/frontend/src/components/widgets/modals/CreateColumnModal.tsx
new file mode 100644
index 00000000..231bd886
--- /dev/null
+++ b/frontend/src/components/widgets/modals/CreateColumnModal.tsx
@@ -0,0 +1,181 @@
+import React, { useState } from "react";
+import {
+  Modal,
+  Form,
+  FormInput,
+  TextArea,
+  FormGroup,
+  FormButton,
+  FormField,
+  TextAreaProps,
+  InputOnChangeData,
+  Checkbox,
+  Grid,
+  Button,
+} from "semantic-ui-react";
+import { LanguageModelDropdown } from "../selectors/LanguageModelDropdown";
+import { LooseObject } from "../../types";
+
+interface CreateColumnModalProps {
+  open: boolean;
+  onClose: () => void;
+  onSubmit: (data: any) => void;
+}
+
+export const CreateColumnModal: React.FC<CreateColumnModalProps> = ({
+  open,
+  onClose,
+  onSubmit,
+}) => {
+  const [objData, setObjData] = useState<LooseObject>({});
+
+  const {
+    name,
+    query,
+    matchText,
+    outputType,
+    limitToLabel,
+    instructions,
+    agentic,
+    languageModelId,
+  } = objData;
+
+  const handleChange = (
+    event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
+    data: TextAreaProps | InputOnChangeData,
+    name: string
+  ) => {
+    setObjData({ ...objData, [name]: data.value });
+  };
+
+  const handleSubmit = () => {
+    console.log("Submit data", objData);
+    onSubmit(objData);
+  };
+
+  return (
+    <Modal open={open} onClose={onClose}>
+      <Modal.Header>"Create a New Column"</Modal.Header>
+      <Modal.Content>
+        <Grid centered divided>
+          <Grid.Column>
+            <Grid.Row>
+              <Form>
+                <FormGroup>
+                  <FormInput
+                    placeholder="Name"
+                    name="name"
+                    value={name}
+                    onChange={(e, { value }) =>
+                      setObjData({ ...objData, name: value })
+                    }
+                    style={{ minWidth: "50vw important!" }}
+                  />
+                  <TextArea
+                    rows={6}
+                    name="outputType"
+                    label="Output Type:"
+                    placeholder="str"
+                    value={outputType}
+                    onChange={(
+                      event: React.ChangeEvent<HTMLTextAreaElement>,
+                      data: TextAreaProps
+                    ) => setObjData({ ...objData, outputType: data.value })}
+                  />
+                  <FormField>
+                    <label>Language Model</label>
+                    <LanguageModelDropdown
+                      onChange={(id: string) =>
+                        setObjData({ ...objData, languageModelId: id })
+                      }
+                      languageModelId={languageModelId}
+                    />
+                  </FormField>
+                </FormGroup>
+              </Form>
+            </Grid.Row>
+            <Grid.Row>
+              <Form>
+                <TextArea
+                  rows={3}
+                  name="query"
+                  label="Query:"
+                  placeholder="What is the title of the document?"
+                  value={query}
+                  onChange={(
+                    event: React.ChangeEvent<HTMLTextAreaElement>,
+                    data: TextAreaProps
+                  ) => handleChange(event, data, "query")}
+                />
+              </Form>
+              <Form>
+                <TextArea
+                  rows={3}
+                  name="matchText"
+                  placeh
+                  label="Representative Example:"
+                  placeholder="Place example of text containing relevant data here."
+                  value={matchText}
+                  onChange={(
+                    event: React.ChangeEvent<HTMLTextAreaElement>,
+                    data: TextAreaProps
+                  ) => handleChange(event, data, "matchText")}
+                />
+              </Form>
+              <Form>
+                <TextArea
+                  rows={3}
+                  name="instructions"
+                  placeh
+                  label="Parser Instructions:"
+                  placeholder="Provide detailed instructions for extracting object properties here..."
+                  value={instructions}
+                  onChange={(
+                    event: React.ChangeEvent<HTMLTextAreaElement>,
+                    data: TextAreaProps
+                  ) => handleChange(event, data, "matchText")}
+                />
+              </Form>
+            </Grid.Row>
+            <Grid.Row>
+              <Grid columns={2}>
+                <Grid.Column>
+                  <Grid.Row>
+                    <Checkbox
+                      label="Agentic"
+                      checked={agentic}
+                      onChange={(_, data) =>
+                        setObjData({
+                          ...objData,
+                          agentic: data.checked || false,
+                        })
+                      }
+                    />
+                  </Grid.Row>
+                </Grid.Column>
+                <Grid.Column>
+                  <Grid.Row>
+                    <FormInput
+                      placeholder="Label Name To Limit Search To"
+                      name="limitToLabel"
+                      value={limitToLabel}
+                      onChange={(e, { value }) =>
+                        setObjData({ ...objData, limitToLabel: value })
+                      }
+                      style={{ minWidth: "50vw important!" }}
+                    />
+                  </Grid.Row>
+                </Grid.Column>
+              </Grid>
+            </Grid.Row>
+          </Grid.Column>
+        </Grid>
+        <Button
+          content="Submit"
+          style={{ marginTop: "1vh" }}
+          onClick={handleSubmit}
+        />
+      </Modal.Content>
+    </Modal>
+  );
+};
diff --git a/frontend/src/components/widgets/modals/EditExtractModal.tsx b/frontend/src/components/widgets/modals/EditExtractModal.tsx
index b95e1d93..204f5649 100644
--- a/frontend/src/components/widgets/modals/EditExtractModal.tsx
+++ b/frontend/src/components/widgets/modals/EditExtractModal.tsx
@@ -5,15 +5,29 @@ import {
   Button,
   Modal,
 } from "semantic-ui-react";
-import { ExtractType } from "../../../graphql/types";
-import { useQuery } from "@apollo/client";
+import {
+  ColumnType,
+  DatacellType,
+  DocumentType,
+  ExtractType,
+} from "../../../graphql/types";
+import { useMutation, useQuery } from "@apollo/client";
 import {
   RequestGetExtractOutput,
-  GetExtractsInput,
   REQUEST_GET_EXTRACT,
   RequestGetExtractInput,
 } from "../../../graphql/queries";
 import { DataGrid } from "../../../extracts/datagrid/DataGrid";
+import { useEffect, useState } from "react";
+import {
+  REQUEST_ADD_DOC_TO_EXTRACT,
+  REQUEST_REMOVE_DOC_FROM_EXTRACT,
+  RequestAddDocToExtractInputType,
+  RequestAddDocToExtractOutputType,
+  RequestRemoveDocFromExtractInputType,
+  RequestRemoveDocFromExtractOutputType,
+} from "../../../graphql/mutations";
+import { toast } from "react-toastify";
 
 interface EditExtractModalProps {
   extract: ExtractType | null;
@@ -26,21 +40,107 @@ export const EditExtractModal = ({
   extract,
   toggleModal,
 }: EditExtractModalProps) => {
-  const { loading, error, data, refetch } = useQuery<
-    RequestGetExtractOutput,
-    RequestGetExtractInput
-  >(REQUEST_GET_EXTRACT, {
-    variables: {
-      id: extract ? extract.id : "",
+  const [cells, setCells] = useState<DatacellType[]>([]);
+  const [rows, setRows] = useState<DocumentType[]>([]);
+  const [columns, setColumns] = useState<ColumnType[]>([]);
+
+  const [addDocsToExtract, { loading: add_docs_loading, data: add_docs_data }] =
+    useMutation<
+      RequestAddDocToExtractOutputType,
+      RequestAddDocToExtractInputType
+    >(REQUEST_ADD_DOC_TO_EXTRACT, {
+      onCompleted: (data) => {
+        console.log("Add data to ", data);
+        setRows((old_rows) => [
+          ...old_rows,
+          ...(data.addDocsToExtract.objs as DocumentType[]),
+        ]);
+        toast.success("SUCCESS! Added docs to extract.");
+      },
+      onError: (err) => {
+        toast.error("ERROR! Could not add docs to extract.");
+      },
+    });
+
+  const handleAddDocIdsToExtract = (
+    extractId: string,
+    documentIds: string[]
+  ) => {
+    addDocsToExtract({
+      variables: {
+        extractId,
+        documentIds,
+      },
+    });
+  };
+
+  const [
+    removeDocsFromExtract,
+    { loading: remove_docs_loading, data: remove_docs_data },
+  ] = useMutation<
+    RequestRemoveDocFromExtractOutputType,
+    RequestRemoveDocFromExtractInputType
+  >(REQUEST_REMOVE_DOC_FROM_EXTRACT, {
+    onCompleted: (data) => {
+      toast.success("SUCCESS! Removed docs from extract.");
+      console.log("Removed docs and return data", data);
+      setRows((old_rows) =>
+        old_rows.filter(
+          (item) => !data.removeDocsFromExtract.idsRemoved.includes(item.id)
+        )
+      );
+    },
+    onError: (err) => {
+      toast.error("ERROR! Could not remove docs from extract.");
     },
   });
 
+  const handleRemoveDocIdsFromExtract = (
+    extractId: string,
+    documentIds: string[]
+  ) => {
+    removeDocsFromExtract({
+      variables: {
+        extractId,
+        documentIdsToRemove: documentIds,
+      },
+    });
+  };
+
+  const {
+    loading,
+    error,
+    data: extract_data,
+    refetch,
+  } = useQuery<RequestGetExtractOutput, RequestGetExtractInput>(
+    REQUEST_GET_EXTRACT,
+    {
+      variables: {
+        id: extract ? extract.id : "",
+      },
+    }
+  );
+
+  useEffect(() => {
+    if (extract) {
+      refetch();
+    }
+  }, [extract]);
+
+  useEffect(() => {
+    if (extract_data) {
+      const { fullDatacellList, fullDocumentList, fieldset } =
+        extract_data.extract;
+      setCells(fullDatacellList ? fullDatacellList : []);
+      setRows(fullDocumentList ? fullDocumentList : []);
+      setColumns(fieldset?.fullColumnList ? fieldset.fullColumnList : []);
+    }
+  }, [extract_data]);
+
   if (!extract || !extract.id) {
     return <></>;
   }
 
-  console.log("Extract", data);
-
   return (
     <Modal
       size="fullscreen"
@@ -56,7 +156,14 @@ export const EditExtractModal = ({
     >
       <ModalHeader>Editing Extract {extract.name}</ModalHeader>
       <ModalContent style={{ flex: 1 }}>
-        <DataGrid extract={extract} />
+        <DataGrid
+          onAddDocIds={handleAddDocIdsToExtract}
+          onRemoveDocIds={handleRemoveDocIdsFromExtract}
+          extract={extract}
+          cells={cells}
+          rows={rows}
+          columns={columns}
+        />
       </ModalContent>
       <ModalActions>
         <Button negative onClick={() => toggleModal()}>
diff --git a/frontend/src/components/widgets/modals/SelectDocumentsModal.tsx b/frontend/src/components/widgets/modals/SelectDocumentsModal.tsx
index b068e92f..caeeeb95 100644
--- a/frontend/src/components/widgets/modals/SelectDocumentsModal.tsx
+++ b/frontend/src/components/widgets/modals/SelectDocumentsModal.tsx
@@ -27,12 +27,14 @@ import { selectedDocumentIds } from "../../../graphql/cache";
 
 interface SelectDocumentsModalProps {
   open: boolean;
+  filterDocIds: string[];
   toggleModal: () => void;
   onAddDocumentIds: (documents: string[]) => void;
 }
 
 export const SelectDocumentsModal = ({
   open,
+  filterDocIds,
   toggleModal,
   onAddDocumentIds,
 }: SelectDocumentsModalProps) => {
@@ -87,7 +89,8 @@ export const SelectDocumentsModal = ({
     : [];
   const document_items = document_nodes
     .map((edge) => (edge?.node ? edge.node : undefined))
-    .filter((item): item is DocumentType => !!item);
+    .filter((item): item is DocumentType => !!item)
+    .filter((item) => !filterDocIds.includes(item.id));
 
   // If doc search term changes, refetch documents
   useEffect(() => {
diff --git a/frontend/src/components/widgets/selectors/LanguageModelDropdown.tsx b/frontend/src/components/widgets/selectors/LanguageModelDropdown.tsx
index 76bebe6d..8bba61bc 100644
--- a/frontend/src/components/widgets/selectors/LanguageModelDropdown.tsx
+++ b/frontend/src/components/widgets/selectors/LanguageModelDropdown.tsx
@@ -16,7 +16,7 @@ interface FieldsetOption {
 
 interface LanguageModelDropdownProps {
   read_only?: boolean;
-  languageModel?: LanguageModelType;
+  languageModelId?: string | undefined;
   style?: Record<string, any>;
   onChange?: (values: any) => void;
 }
@@ -25,7 +25,7 @@ export const LanguageModelDropdown = ({
   read_only,
   style,
   onChange,
-  languageModel,
+  languageModelId,
 }: LanguageModelDropdownProps) => {
   const [searchQuery, setSearchQuery] = useState<string>();
 
@@ -72,7 +72,7 @@ export const LanguageModelDropdown = ({
     const selected = _.find(fieldsets, { id: data.value });
     if (onChange) {
       if (selected) {
-        onChange(selected as LanguageModelType);
+        onChange(data.value);
       } else {
         onChange(null);
       }
@@ -107,7 +107,7 @@ export const LanguageModelDropdown = ({
       search
       disabled={read_only}
       options={getDropdownOptions()}
-      value={languageModel ? languageModel.id : undefined}
+      value={languageModelId ? languageModelId : undefined}
       placeholder="Select Language Model"
       onChange={read_only ? () => {} : handleSelectionChange}
       onSearchChange={handleSearchChange}
diff --git a/frontend/src/extracts/datagrid/DataGrid.tsx b/frontend/src/extracts/datagrid/DataGrid.tsx
index 609dab81..8a65fb78 100644
--- a/frontend/src/extracts/datagrid/DataGrid.tsx
+++ b/frontend/src/extracts/datagrid/DataGrid.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import {
   Table,
   Input,
@@ -18,6 +18,7 @@ import {
 import { useMutation } from "@apollo/client";
 import {
   REQUEST_ADD_DOC_TO_EXTRACT,
+  REQUEST_CREATE_COLUMN,
   REQUEST_DELETE_COLUMN,
   REQUEST_REMOVE_DOC_FROM_EXTRACT,
   REQUEST_UPDATE_COLUMN,
@@ -38,23 +39,37 @@ import {
   editColumnForm_Ui_Schema,
 } from "../../components/forms/schemas";
 import { LanguageModelDropdown } from "../../components/widgets/selectors/LanguageModelDropdown";
+import { addingColumnToExtract } from "../../graphql/cache";
 
 interface DataGridProps {
   extract: ExtractType;
+  cells: DatacellType[];
+  rows: DocumentType[];
+  onAddDocIds: (extractId: string, documentIds: string[]) => void;
+  onRemoveDocIds: (extractId: string, documentIds: string[]) => void;
+  columns: ColumnType[];
 }
 
-export const DataGrid = ({ extract }: DataGridProps) => {
+export const DataGrid = ({
+  extract,
+  cells,
+  rows,
+  columns,
+  onAddDocIds,
+  onRemoveDocIds,
+}: DataGridProps) => {
   const [column_to_edit, setColumnToEdit] = useState<ColumnType | null>(null);
   const [isAddingColumn, setIsAddingColumn] = useState(false);
-  const [showAddColumnModal, setShowAddColumnModal] = useState(false);
   const [showAddRowButton, setShowAddRowButton] = useState(false);
   const [openAddRowModal, setOpenAddRowModal] = useState(false);
 
-  const { fullDatacellList, documents, fieldset } = extract;
+  useEffect(() => {
+    console.log("DataGrid rows ", rows);
+  }, [rows]);
 
-  const cells = fullDatacellList ? fullDatacellList : [];
-  const rows = documents ? documents : [];
-  const columns = fieldset?.fullColumnList ? fieldset.fullColumnList : [];
+  useEffect(() => {
+    console.log("DataGrid columns", columns);
+  }, [columns]);
 
   const [
     deleteColumn,
@@ -94,35 +109,6 @@ export const DataGrid = ({ extract }: DataGridProps) => {
     }
   );
 
-  // TODO - I think I need to do something in the cache here...
-  const [
-    removeDocsFromExtract,
-    { loading: remove_docs_loading, data: remove_docs_data },
-  ] = useMutation<
-    RequestRemoveDocFromExtractOutputType,
-    RequestRemoveDocFromExtractInputType
-  >(REQUEST_REMOVE_DOC_FROM_EXTRACT, {
-    onCompleted: (data) => {
-      toast.success("SUCCESS! Removed docs from extract.");
-    },
-    onError: (err) => {
-      toast.error("ERROR! Could not remove docs from extract.");
-    },
-  });
-
-  const [addDocsToExtract, { loading: add_docs_loading, data: add_docs_data }] =
-    useMutation<
-      RequestAddDocToExtractOutputType,
-      RequestAddDocToExtractInputType
-    >(REQUEST_ADD_DOC_TO_EXTRACT, {
-      onCompleted: (data) => {
-        toast.success("SUCCESS! Added docs to extract.");
-      },
-      onError: (err) => {
-        toast.error("ERROR! Could not add docs to extract.");
-      },
-    });
-
   return (
     <div
       style={{
@@ -144,10 +130,9 @@ export const DataGrid = ({ extract }: DataGridProps) => {
       <SelectDocumentsModal
         open={openAddRowModal}
         onAddDocumentIds={(documentIds: string[]) =>
-          addDocsToExtract({
-            variables: { extractId: extract.id, documentIds },
-          })
+          onAddDocIds(extract.id, documentIds)
         }
+        filterDocIds={rows.map((row) => row.id)}
         toggleModal={() => setOpenAddRowModal(!openAddRowModal)}
       />
       <CRUDModal
@@ -167,23 +152,6 @@ export const DataGrid = ({ extract }: DataGridProps) => {
           labelSet: <LanguageModelDropdown />,
         }}
       />
-      <CRUDModal
-        open={showAddColumnModal}
-        mode="CREATE"
-        old_instance={{}}
-        model_name="column"
-        ui_schema={editColumnForm_Ui_Schema}
-        data_schema={editColumnForm_Schema}
-        has_file={false}
-        file_is_image={false}
-        accepted_file_types=""
-        file_field=""
-        file_label=""
-        onClose={() => setColumnToEdit(null)}
-        property_widgets={{
-          labelSet: <LanguageModelDropdown />,
-        }}
-      />
       <Table celled style={{ flex: 1 }}>
         <Table.Header fullWidth>
           <Table.Row>
@@ -241,14 +209,7 @@ export const DataGrid = ({ extract }: DataGridProps) => {
                       />
                       <Dropdown.Item
                         text="Delete"
-                        onClick={() =>
-                          removeDocsFromExtract({
-                            variables: {
-                              extractId: extract.id,
-                              documentIdsToRemove: [row.id],
-                            },
-                          })
-                        }
+                        onClick={() => onRemoveDocIds(extract.id, [row.id])}
                       />
                     </Dropdown.Menu>
                   </Dropdown>
@@ -282,7 +243,7 @@ export const DataGrid = ({ extract }: DataGridProps) => {
           <Button
             icon="plus"
             circular
-            onClick={() => setShowAddColumnModal(true)}
+            onClick={() => addingColumnToExtract(extract)}
           />
         </div>
       )}
diff --git a/frontend/src/extracts/datagrid/columns/ColumnCard.tsx b/frontend/src/extracts/datagrid/columns/ColumnCard.tsx
index 9dac86f4..760e3286 100644
--- a/frontend/src/extracts/datagrid/columns/ColumnCard.tsx
+++ b/frontend/src/extracts/datagrid/columns/ColumnCard.tsx
@@ -125,9 +125,9 @@ const ColumnHeaderCard: React.FC<{
                 languageModel: data ? data : null,
               })
             }
-            languageModel={
+            languageModelId={
               editedColumn?.languageModel
-                ? editedColumn.languageModel
+                ? editedColumn.languageModel.id
                 : undefined
             }
           />
diff --git a/frontend/src/extracts/list/ExtractListItem.tsx b/frontend/src/extracts/list/ExtractListItem.tsx
index ff655e91..c4e505c4 100644
--- a/frontend/src/extracts/list/ExtractListItem.tsx
+++ b/frontend/src/extracts/list/ExtractListItem.tsx
@@ -5,7 +5,6 @@ import { DateTimeWidget } from "../../components/widgets/data-display/DateTimeWi
 interface ExtractItemRowProps {
   style?: Record<string, any>;
   item: ExtractType;
-  key: string;
   onDelete: (args?: any) => void | any;
   onSelect?: (item: ExtractType) => void;
 }
@@ -14,7 +13,6 @@ export function ExtractItemRow({
   onSelect,
   onDelete,
   item,
-  key,
 }: ExtractItemRowProps) {
   let createdTime = "";
   let createdDate = "N/A";
@@ -41,7 +39,7 @@ export function ExtractItemRow({
   }
 
   return (
-    <Table.Row key={key}>
+    <Table.Row key={item.id}>
       <Table.Cell>{item.name}</Table.Cell>
       <Table.Cell>
         <DateTimeWidget timeString={createdTime} dateString={createdDate} />
diff --git a/frontend/src/graphql/cache.ts b/frontend/src/graphql/cache.ts
index e1a06c81..ac747fe1 100644
--- a/frontend/src/graphql/cache.ts
+++ b/frontend/src/graphql/cache.ts
@@ -67,27 +67,6 @@ export const cache = new InMemoryCache({
     PageAwareAnnotationType: {
       fields: {
         pageAnnotations: {
-          // merge: (existing: Reference[] = [], incoming: Reference[] = [], { readField }) => {
-
-          //   console.log("Attempt merge");
-
-          //   const merged: any[] = existing ? existing.slice(0) : [];
-          //   const existing_ids = existing.map((item) => readField<string>('id', item))
-
-          //   incoming.forEach((incoming_annotation) => {
-          //     const incoming_item_id = readField<string>('id', incoming_annotation);
-          //     if (!existing_ids.includes(incoming_item_id)) {
-          //       console.log("New id detected...", incoming_item_id);
-          //       merged.push(incoming_annotation);
-
-          //     }
-          //   })
-
-          //   console.log("Cache - incoming", incoming, "existing", existing, "merged", merged);
-
-          //   return merged;
-
-          // },
           keyArgs: ["documentId", "corpusId", "forAnalysisIds", "labelType"],
         },
       },
@@ -159,6 +138,9 @@ export const cache = new InMemoryCache({
         labelsets: relayStylePagination(),
         annotationLabels: relayStylePagination(),
         relationshipLabels: relayStylePagination(),
+        extracts: relayStylePagination(),
+        columns: relayStylePagination(),
+        languageModels: relayStylePagination(),
       },
     },
   },
@@ -255,6 +237,9 @@ export const analysisSearchTerm = makeVar<string>("");
 export const exportSearchTerm = makeVar<string>("");
 export const selectedFieldset = makeVar<FieldsetType | null>(null);
 export const selectedLanguageModel = makeVar<LanguageModelType | null>(null);
+export const editingExtract = makeVar<ExtractType | null>(null);
+export const addingColumnToExtract = makeVar<ExtractType | null>(null);
+export const editingColumnForExtract = makeVar<ExtractType | null>(null);
 
 /**
  * Auth-related global variables
diff --git a/frontend/src/graphql/mutations.ts b/frontend/src/graphql/mutations.ts
index 4420499a..44b8635a 100644
--- a/frontend/src/graphql/mutations.ts
+++ b/frontend/src/graphql/mutations.ts
@@ -6,6 +6,7 @@ import {
   AnnotationLabelType,
   ColumnType,
   CorpusType,
+  DocumentType,
   ExtractType,
   FieldsetType,
   LabelSetType,
@@ -1175,7 +1176,7 @@ export const REQUEST_UPDATE_FIELDSET = gql`
 `;
 
 export interface RequestCreateColumnInputType {
-  fieldsetId: string;
+  fieldsetId?: string;
   query: string;
   matchText?: string;
   outputType: string;
@@ -1183,6 +1184,7 @@ export interface RequestCreateColumnInputType {
   instructions?: string;
   languageModelId: string;
   agentic: boolean;
+  name: string;
 }
 
 export interface RequestCreateColumnOutputType {
@@ -1195,14 +1197,15 @@ export interface RequestCreateColumnOutputType {
 
 export const REQUEST_CREATE_COLUMN = gql`
   mutation CreateColumn(
+    $name: String!
     $fieldsetId: ID!
-    $query: String!
+    $query: String
     $matchText: String
     $outputType: String!
     $limitToLabel: String
     $instructions: String
     $languageModelId: ID!
-    $agentic: Boolean!
+    $agentic: Boolean
   ) {
     createColumn(
       fieldsetId: $fieldsetId
@@ -1213,8 +1216,9 @@ export const REQUEST_CREATE_COLUMN = gql`
       instructions: $instructions
       languageModelId: $languageModelId
       agentic: $agentic
+      name: $name
     ) {
-      msg
+      message
       ok
       obj {
         id
@@ -1254,9 +1258,11 @@ export const REQUEST_DELETE_COLUMN = gql`
 `;
 
 export interface RequestAddDocToExtractOutputType {
-  ok: boolean;
-  message: string;
-  objId: string;
+  addDocsToExtract: {
+    ok: boolean;
+    message: string;
+    objs: DocumentType[];
+  };
 }
 
 export interface RequestAddDocToExtractInputType {
@@ -1269,14 +1275,23 @@ export const REQUEST_ADD_DOC_TO_EXTRACT = gql`
     addDocsToExtract(documentIds: $documentIds, extractId: $extractId) {
       ok
       message
-      objId
+      objs {
+        __typename
+        id
+        title
+        description
+        pageCount
+      }
     }
   }
 `;
 
 export interface RequestRemoveDocFromExtractOutputType {
-  ok: boolean;
-  message: string;
+  removeDocsFromExtract: {
+    ok: boolean;
+    message: string;
+    idsRemoved: string[];
+  };
 }
 
 export interface RequestRemoveDocFromExtractInputType {
@@ -1292,6 +1307,7 @@ export const REQUEST_REMOVE_DOC_FROM_EXTRACT = gql`
     ) {
       ok
       message
+      idsRemoved
     }
   }
 `;
diff --git a/frontend/src/graphql/queries.ts b/frontend/src/graphql/queries.ts
index c53d86fb..bf46b6ad 100644
--- a/frontend/src/graphql/queries.ts
+++ b/frontend/src/graphql/queries.ts
@@ -118,9 +118,7 @@ export const SEARCH_DOCUMENTS = gql`
     $limit: Int
     $textSearch: String
     $hasLabelWithId: String
-    $annotateDocLabels: Boolean!
     $hasAnnotationsWithIds: String
-    $includeMetadata: Boolean!
   ) {
     documents(
       inCorpusWithId: $inCorpusWithId
@@ -141,6 +139,7 @@ export const SEARCH_DOCUMENTS = gql`
           icon
           isPublic
           myPermissions
+          is_selected @client
         }
       }
       pageInfo {
@@ -1150,6 +1149,7 @@ export const REQUEST_GET_EXTRACT = gql`
         name
         fullColumnList {
           id
+          name
           query
           matchText
           limitToLabel
@@ -1167,6 +1167,12 @@ export const REQUEST_GET_EXTRACT = gql`
       created
       started
       finished
+      fullDocumentList {
+        id
+        title
+        description
+        pageCount
+      }
       fullDatacellList {
         id
         column {
diff --git a/frontend/src/graphql/types.ts b/frontend/src/graphql/types.ts
index b69fa400..4d3daa90 100644
--- a/frontend/src/graphql/types.ts
+++ b/frontend/src/graphql/types.ts
@@ -1186,14 +1186,14 @@ export interface FieldsetType extends Node {
 
 export interface ColumnType extends Node {
   name: Maybe<string>;
-  fieldset: FieldsetType;
-  query: string;
+  fieldset?: FieldsetType;
+  query?: string;
   matchText?: Maybe<string>;
   outputType: string;
   limitToLabel?: Maybe<string>;
   instructions?: Maybe<string>;
   languageModel?: Maybe<LanguageModelType>;
-  agentic: boolean;
+  agentic?: boolean;
 }
 
 export interface ColumnTypeEdge {
@@ -1229,6 +1229,7 @@ export interface ExtractType extends Node {
   documents?: DocumentType[];
   extractedDatacells?: DatacellTypeConnection;
   fullDatacellList?: DatacellType[];
+  fullDocumentList?: DocumentType[];
 }
 
 export interface DatacellType extends Node {
diff --git a/frontend/src/views/Extracts.tsx b/frontend/src/views/Extracts.tsx
index 9a5f1e6f..fc8301c5 100644
--- a/frontend/src/views/Extracts.tsx
+++ b/frontend/src/views/Extracts.tsx
@@ -8,6 +8,9 @@ import {
   RequestDeleteExtractOutputType,
   RequestDeleteExtractInputType,
   REQUEST_DELETE_EXTRACT,
+  RequestCreateColumnInputType,
+  REQUEST_CREATE_COLUMN,
+  RequestCreateColumnOutputType,
 } from "../graphql/mutations";
 import {
   GET_DOCUMENTS,
@@ -22,6 +25,7 @@ import {
   showDeleteExtractModal,
   showEditExtractModal,
   showCreateExtractModal,
+  addingColumnToExtract,
 } from "../graphql/cache";
 
 import { ActionDropdownItem, LooseObject } from "../components/types";
@@ -32,6 +36,13 @@ import { ExtractList } from "../extracts/list/ExtractList";
 import { CreateAndSearchBar } from "../components/layout/CreateAndSearchBar";
 import { CreateExtractModal } from "../components/widgets/modals/CreateExtractModal";
 import { EditExtractModal } from "../components/widgets/modals/EditExtractModal";
+import { CRUDModal } from "../components/widgets/CRUD/CRUDModal";
+import {
+  editColumnForm_Schema,
+  editColumnForm_Ui_Schema,
+} from "../components/forms/schemas";
+import { LanguageModelDropdown } from "../components/widgets/selectors/LanguageModelDropdown";
+import { CreateColumnModal } from "../components/widgets/modals/CreateColumnModal";
 
 export const Extracts = () => {
   const auth_token = useReactiveVar(authToken);
@@ -40,6 +51,7 @@ export const Extracts = () => {
   const show_create_extract_modal = useReactiveVar(showCreateExtractModal);
   const show_edit_extract_modal = useReactiveVar(showEditExtractModal);
   const show_delete_extract_modal = useReactiveVar(showDeleteExtractModal);
+  const adding_column_to_extract = useReactiveVar(addingColumnToExtract);
 
   const location = useLocation();
 
@@ -83,6 +95,25 @@ export const Extracts = () => {
   ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
   // Implementing various resolvers / mutations to create action methods
   ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+  const [
+    createColumn,
+    {
+      loading: create_column_loading,
+      error: create_column_error,
+      data: create_column_data,
+    },
+  ] = useMutation<RequestCreateColumnOutputType, RequestCreateColumnInputType>(
+    REQUEST_CREATE_COLUMN,
+    {
+      onCompleted: (data) => {
+        toast.success("SUCCESS! Created column.");
+      },
+      onError: (err) => {
+        toast.error("ERROR! Could not create column.");
+      },
+    }
+  );
+
   const [tryDeleteExtract] = useMutation<
     RequestDeleteExtractOutputType,
     RequestDeleteExtractInputType
@@ -152,6 +183,23 @@ export const Extracts = () => {
             open={opened_extract !== null}
             toggleModal={() => openedExtract(null)}
           />
+          {adding_column_to_extract ? (
+            <CreateColumnModal
+              open={adding_column_to_extract !== null}
+              onSubmit={(data) => {
+                console.log("Create col with data", data);
+                createColumn({
+                  variables: {
+                    fieldsetId: adding_column_to_extract.fieldset.id,
+                    ...data,
+                  },
+                });
+              }}
+              onClose={() => addingColumnToExtract(null)}
+            />
+          ) : (
+            <></>
+          )}
         </>
       }
       SearchBar={<CreateAndSearchBar actions={extract_actions} />}
diff --git a/frontend/src/views/Login.tsx b/frontend/src/views/Login.tsx
index 47adeb69..cd88b67a 100644
--- a/frontend/src/views/Login.tsx
+++ b/frontend/src/views/Login.tsx
@@ -130,7 +130,7 @@ export const Login = () => {
                   <Header.Subheader
                     style={{ marginTop: ".25em", fontSize: ".65em" }}
                   >
-                    The Open Contract Labeling Platform
+                    The Open Contract Analytics Platform
                   </Header.Subheader>
                 </Header>
               </div>