diff --git a/admin/locations.php b/admin/locations.php
index 99da577..181e900 100644
--- a/admin/locations.php
+++ b/admin/locations.php
@@ -13,7 +13,7 @@
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+   General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.  If not, write to
@@ -22,17 +22,34 @@
 */
 ?>
 <?
- require("../common.inc.php");
- require_once("../user.inc.php");
- user_auth_required('committee', 'admin');
+require("../common.inc.php");
+require("../tableeditor.class.php");
+require_once("../user.inc.php");
+user_auth_required('committee', 'admin');
 
- send_header("Event Locations", 
- 	array('Committee Main' => 'committee_main.php',
+send_header("Event Locations", 
+	array('Committee Main' => 'committee_main.php',
 		'Administration' => 'admin/index.php'),
-        "events_scheduling" );
+		"events_scheduling" );
 
- echo "<br />";
+echo "<br />";
+$editor = new TableEditor("locations",
+	array(
+		"name" => "Location Name"
+	),
+	array(
+		"name" => "Location Name"
+	),
+	array(
+		"conferences_id" => $conference['id']
+	)
 
- send_footer();
+);
+$editor->setPrimaryKey("id");
+$editor->execute();
+
+	
+
+send_footer();
 
 ?>
diff --git a/db/db.code.version.txt b/db/db.code.version.txt
index f07e286..1057e9a 100644
--- a/db/db.code.version.txt
+++ b/db/db.code.version.txt
@@ -1 +1 @@
-175
+176
diff --git a/db/db.update.176.sql b/db/db.update.176.sql
new file mode 100644
index 0000000..9cbfa8a
--- /dev/null
+++ b/db/db.update.176.sql
@@ -0,0 +1,8 @@
+
+CREATE TABLE `locations` (
+`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`conference_id` INT NOT NULL ,
+`name` VARCHAR( 128 ) NOT NULL
+) ENGINE = MYISAM ;
+
+