diff --git a/res/userdb.db b/res/userdb.db
index dd0d554..f1f999e 100644
Binary files a/res/userdb.db and b/res/userdb.db differ
diff --git a/src/main/java/seng202/group9/Controller/App.java b/src/main/java/seng202/group9/Controller/App.java
index bc481ea..f6a1c53 100644
--- a/src/main/java/seng202/group9/Controller/App.java
+++ b/src/main/java/seng202/group9/Controller/App.java
@@ -99,6 +99,7 @@ public class App extends Application
 			session = new Session();
 			e.printStackTrace();
 		}
+		menuController.createPopUpStage(SceneCode.DATASET_CONTROLLER, 600, 400);
 	}
 
 	/**
diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java
index 3743aeb..8aed09a 100644
--- a/src/main/java/seng202/group9/Controller/Dataset.java
+++ b/src/main/java/seng202/group9/Controller/Dataset.java
@@ -2175,4 +2175,12 @@ public class Dataset {
             System.exit(0);
         }
     }
+
+    /**
+     * Name of the dataset in the database
+     */
+    @Override
+    public String toString(){
+        return this.name;
+    }
 }
diff --git a/src/main/java/seng202/group9/Controller/SceneCode.java b/src/main/java/seng202/group9/Controller/SceneCode.java
index eb6844b..d1ae151 100644
--- a/src/main/java/seng202/group9/Controller/SceneCode.java
+++ b/src/main/java/seng202/group9/Controller/SceneCode.java
@@ -12,7 +12,7 @@ public enum SceneCode {
     AIRPORT_DIST_CALC("airport_dist_calc.fxml"), AIRLINE_ADD("airline_add_form.fxml"), AIRLINE_FILTER("airline_filter_form.fxml"),
     AIRPORT_ADD("airport_add_form.fxml"), AIRPORT_FILTER("airport_filter_form.fxml"), ROUTE_ADD("route_add_form.fxml"),
     ROUTE_FILTER("route_filter_form.fxml"), AIRLINE_EDIT("airline_edit_form.fxml"), AIRPORT_EDIT("airport_edit_form.fxml"),
-    ROUTE_EDIT("route_edit_form.fxml"), FLIGHT_EDITOR("flight_editor_form.fxml");
+    ROUTE_EDIT("route_edit_form.fxml"), FLIGHT_EDITOR("flight_editor_form.fxml"), DATASET_CONTROLLER("dataset_editor.fxml");
 
 
     private String filePath;
diff --git a/src/main/java/seng202/group9/GUI/DatasetController.java b/src/main/java/seng202/group9/GUI/DatasetController.java
new file mode 100644
index 0000000..26e27f4
--- /dev/null
+++ b/src/main/java/seng202/group9/GUI/DatasetController.java
@@ -0,0 +1,46 @@
+package seng202.group9.GUI;
+
+import javafx.beans.InvalidationListener;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.ListView;
+import javafx.scene.control.TextField;
+import seng202.group9.Controller.Dataset;
+
+import java.util.*;
+
+import static javafx.collections.FXCollections.observableArrayList;
+
+/**
+ * Created by fwy13 on 30/09/16.
+ */
+public class DatasetController extends Controller{
+
+    @FXML
+    ListView datasetView;
+    @FXML
+    TextField datasetName;
+    Dataset curDataset = null;
+    ObservableList<Dataset> datasetList = observableArrayList();
+
+    public void load() {
+        curDataset = getParent().getCurrentDataset();
+        ArrayList<Dataset> datasets = getParent().getDatasets();
+        datasetList = observableArrayList(datasets);
+        datasetView.setItems(datasetList);
+    }
+
+    public void deleteDataset(){
+
+    }
+
+    public void addDataset(){
+
+    }
+
+    public void openDataset(){
+
+    }
+}
diff --git a/src/main/resources/dataset_editor.fxml b/src/main/resources/dataset_editor.fxml
new file mode 100644
index 0000000..9e2f29c
--- /dev/null
+++ b/src/main/resources/dataset_editor.fxml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.text.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="598.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" fx:controller="seng202.group9.GUI.DatasetController">
+  <columnConstraints>
+    <ColumnConstraints hgrow="SOMETIMES" maxWidth="517.0" minWidth="10.0" prefWidth="496.0" />
+    <ColumnConstraints hgrow="SOMETIMES" maxWidth="300.0" minWidth="10.0" prefWidth="104.0" />
+  </columnConstraints>
+  <rowConstraints>
+    <RowConstraints maxHeight="319.0" minHeight="10.0" prefHeight="41.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="319.0" minHeight="10.0" prefHeight="264.0" vgrow="SOMETIMES" />
+    <RowConstraints maxHeight="194.0" minHeight="10.0" prefHeight="40.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="194.0" minHeight="10.0" prefHeight="41.0" vgrow="SOMETIMES" />
+  </rowConstraints>
+   <children>
+      <ListView fx:id="datasetView" prefHeight="200.0" prefWidth="597.0" GridPane.columnSpan="2" GridPane.rowIndex="1">
+         <contextMenu>
+            <ContextMenu>
+              <items>
+                <MenuItem fx:id="deleteBtn" mnemonicParsing="false" onAction="#deleteDataset" text="Unspecified Action" />
+              </items>
+            </ContextMenu>
+         </contextMenu>
+      </ListView>
+      <TextField fx:id="datasetName" prefHeight="25.0" prefWidth="485.0" promptText="Dataset Name" GridPane.rowIndex="2" />
+      <Button fx:id="addDataset" mnemonicParsing="false" onAction="#addDataset" prefHeight="25.0" prefWidth="84.0" text="Add" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="2" />
+      <Label text="Select or Add a Dataset" GridPane.columnSpan="2" GridPane.halignment="CENTER">
+         <font>
+            <Font size="18.0" />
+         </font>
+      </Label>
+      <Button mnemonicParsing="false" onAction="#openDataset" prefHeight="25.0" prefWidth="785.0" text="Open" GridPane.columnSpan="2" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
+   </children>
+   <padding>
+      <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+   </padding>
+</GridPane>