diff --git a/ROADMAP.md b/ROADMAP.md
new file mode 100644
index 00000000..aa347b32
--- /dev/null
+++ b/ROADMAP.md
@@ -0,0 +1,62 @@
+# Firetable Roadmap
+
+## POC
+
+### Initial fields:
+
+- checkbox(boolean)
+- simple text(string)
+- email(string)
+- phone(string)
+- url(string)
+- Number(number)
+- long text(string)
+
+### Functionality:
+
+- Create Tables (Primary collections)
+- Create columns (fields)
+- Create rows(documents)
+
+## MVP
+
+### additional fields:
+
+- tags(array of strings)
+- single select(string)
+- date(Firebase timestamp)
+- time(Firebase timestamp)
+- index(number)
+- file(firebase storage url string)
+- [https://material-ui.com/components/chips/#chip-array]Multiple select(array of strings)
+- image(firebase storage url string)
+- reference(DocRefrence)
+- [https://material-ui.com/components/rating/]rating(number)
+
+### Functionality:
+
+- Hide/show columns
+- Delete columns
+- Delete rows
+- Delete tables
+- Filters:
+  - equals to
+  - Starts with
+  - contains
+
+## V1
+
+### additional fields:
+
+- Percentage(number)
+- table(Document[])
+- richtext(html string)
+
+### Functionality:
+
+- Sort rows
+- Locked columns
+- Table view only mode
+- Subcollection tables
+- Permissions
+- Duplicate columns
diff --git a/src/components/Table.tsx b/src/components/Table.tsx
index fd4fad3d..c92435c0 100644
--- a/src/components/Table.tsx
+++ b/src/components/Table.tsx
@@ -11,7 +11,7 @@ import Paper from "@material-ui/core/Paper";
 import {
   AutoSizer,
   Column,
-  Table,
+  Table as MuiTable,
   TableCellRenderer,
   TableHeaderProps
 } from "react-virtualized";
@@ -169,7 +169,7 @@ class MuiVirtualizedTable extends React.PureComponent<
     return (
       <AutoSizer>
         {({ height, width }) => (
-          <Table
+          <MuiTable
             height={height}
             width={width}
             rowHeight={rowHeight!}
@@ -196,7 +196,7 @@ class MuiVirtualizedTable extends React.PureComponent<
                 );
               })
             ]}
-          </Table>
+          </MuiTable>
         )}
       </AutoSizer>
     );
@@ -205,9 +205,9 @@ class MuiVirtualizedTable extends React.PureComponent<
 
 const VirtualizedTable = withStyles(styles)(MuiVirtualizedTable);
 
-export default function fTable(props: any) {
+export default function Table(props: any) {
   const { columns, rows, addColumn, deleteRow } = props;
-  //  const [focus, setFocus] = useState(false);
+  const [focus, setFocus] = useState(false);
   if (columns)
     return (
       <Paper style={{ height: 400, width: "100%" }}>