diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Create.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Create.java
new file mode 100644
index 000000000..372d2486b
--- /dev/null
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Create.java
@@ -0,0 +1,46 @@
+package net.sourceforge.guacamole.net.basic.crud.connections;
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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 Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import java.io.IOException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import net.sourceforge.guacamole.net.auth.UserContext;
+import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet;
+
+/**
+ * Simple HttpServlet which handles connection creation.
+ *
+ * @author Michael Jumper
+ */
+public class Create extends AuthenticatingHttpServlet {
+
+    @Override
+    protected void authenticatedService(
+            UserContext context,
+            HttpServletRequest request, HttpServletResponse response)
+    throws IOException, ServletException {
+
+        /* FIXME: STUB */
+        
+    }
+
+}
+
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Delete.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Delete.java
new file mode 100644
index 000000000..3f1c14b5b
--- /dev/null
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Delete.java
@@ -0,0 +1,46 @@
+package net.sourceforge.guacamole.net.basic.crud.connections;
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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 Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import java.io.IOException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import net.sourceforge.guacamole.net.auth.UserContext;
+import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet;
+
+/**
+ * Simple HttpServlet which handles connection deletion.
+ *
+ * @author Michael Jumper
+ */
+public class Delete extends AuthenticatingHttpServlet {
+
+    @Override
+    protected void authenticatedService(
+            UserContext context,
+            HttpServletRequest request, HttpServletResponse response)
+    throws IOException, ServletException {
+
+        /* FIXME: STUB */
+        
+    }
+
+}
+
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Update.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Update.java
new file mode 100644
index 000000000..67e687abb
--- /dev/null
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Update.java
@@ -0,0 +1,46 @@
+package net.sourceforge.guacamole.net.basic.crud.connections;
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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 Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import java.io.IOException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import net.sourceforge.guacamole.net.auth.UserContext;
+import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet;
+
+/**
+ * Simple HttpServlet which handles connection update.
+ *
+ * @author Michael Jumper
+ */
+public class Update extends AuthenticatingHttpServlet {
+
+    @Override
+    protected void authenticatedService(
+            UserContext context,
+            HttpServletRequest request, HttpServletResponse response)
+    throws IOException, ServletException {
+
+        /* FIXME: STUB */
+        
+    }
+
+}
+
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Create.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Create.java
new file mode 100644
index 000000000..1bc04c852
--- /dev/null
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Create.java
@@ -0,0 +1,46 @@
+package net.sourceforge.guacamole.net.basic.crud.users;
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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 Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import java.io.IOException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import net.sourceforge.guacamole.net.auth.UserContext;
+import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet;
+
+/**
+ * Simple HttpServlet which handles user creation.
+ *
+ * @author Michael Jumper
+ */
+public class Create extends AuthenticatingHttpServlet {
+
+    @Override
+    protected void authenticatedService(
+            UserContext context,
+            HttpServletRequest request, HttpServletResponse response)
+    throws IOException, ServletException {
+
+        /* FIXME: STUB */
+        
+    }
+
+}
+
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Delete.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Delete.java
new file mode 100644
index 000000000..214ea5ee0
--- /dev/null
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Delete.java
@@ -0,0 +1,46 @@
+package net.sourceforge.guacamole.net.basic.crud.users;
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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 Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import java.io.IOException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import net.sourceforge.guacamole.net.auth.UserContext;
+import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet;
+
+/**
+ * Simple HttpServlet which handles user deletion.
+ *
+ * @author Michael Jumper
+ */
+public class Delete extends AuthenticatingHttpServlet {
+
+    @Override
+    protected void authenticatedService(
+            UserContext context,
+            HttpServletRequest request, HttpServletResponse response)
+    throws IOException, ServletException {
+
+        /* FIXME: STUB */
+        
+    }
+
+}
+
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Update.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Update.java
new file mode 100644
index 000000000..e7078edf9
--- /dev/null
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Update.java
@@ -0,0 +1,46 @@
+package net.sourceforge.guacamole.net.basic.crud.users;
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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 Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import java.io.IOException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import net.sourceforge.guacamole.net.auth.UserContext;
+import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet;
+
+/**
+ * Simple HttpServlet which handles user update.
+ *
+ * @author Michael Jumper
+ */
+public class Update extends AuthenticatingHttpServlet {
+
+    @Override
+    protected void authenticatedService(
+            UserContext context,
+            HttpServletRequest request, HttpServletResponse response)
+    throws IOException, ServletException {
+
+        /* FIXME: STUB */
+        
+    }
+
+}
+
diff --git a/guacamole/src/main/webapp/WEB-INF/web.xml b/guacamole/src/main/webapp/WEB-INF/web.xml
index ce8212712..2a2616de2 100644
--- a/guacamole/src/main/webapp/WEB-INF/web.xml
+++ b/guacamole/src/main/webapp/WEB-INF/web.xml
@@ -55,6 +55,17 @@
         <url-pattern>/logout</url-pattern>
     </servlet-mapping>
 
+    <!-- Connection Creation Servlet -->
+    <servlet>
+        <description>Connection creation servlet.</description>
+        <servlet-name>ConnectionCreate</servlet-name>
+        <servlet-class>net.sourceforge.guacamole.net.basic.crud.connections.Create</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>ConnectionCreate</servlet-name>
+        <url-pattern>/connections/create</url-pattern>
+    </servlet-mapping>
+
     <!-- Connection List Servlet -->
     <servlet>
         <description>Connection list servlet.</description>
@@ -66,6 +77,39 @@
         <url-pattern>/connections</url-pattern>
     </servlet-mapping>
 
+    <!-- Connection Update Servlet -->
+    <servlet>
+        <description>Connection update servlet.</description>
+        <servlet-name>ConnectionUpdate</servlet-name>
+        <servlet-class>net.sourceforge.guacamole.net.basic.crud.connections.Update</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>ConnectionUpdate</servlet-name>
+        <url-pattern>/connections/update</url-pattern>
+    </servlet-mapping>
+
+    <!-- Connection Deletion Servlet -->
+    <servlet>
+        <description>Connection deletion servlet.</description>
+        <servlet-name>ConnectionDelete</servlet-name>
+        <servlet-class>net.sourceforge.guacamole.net.basic.crud.connections.Delete</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>ConnectionDelete</servlet-name>
+        <url-pattern>/connections/delete</url-pattern>
+    </servlet-mapping>
+
+    <!-- User Creation Servlet -->
+    <servlet>
+        <description>User creation servlet.</description>
+        <servlet-name>UserCreate</servlet-name>
+        <servlet-class>net.sourceforge.guacamole.net.basic.crud.users.Create</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>UserCreate</servlet-name>
+        <url-pattern>/users/create</url-pattern>
+    </servlet-mapping>
+
     <!-- User List Servlet -->
     <servlet>
         <description>User list servlet.</description>
@@ -77,6 +121,28 @@
         <url-pattern>/users</url-pattern>
     </servlet-mapping>
 
+    <!-- User Update Servlet -->
+    <servlet>
+        <description>User update servlet.</description>
+        <servlet-name>UserUpdate</servlet-name>
+        <servlet-class>net.sourceforge.guacamole.net.basic.crud.users.Update</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>UserUpdate</servlet-name>
+        <url-pattern>/users/update</url-pattern>
+    </servlet-mapping>
+
+    <!-- User Deletion Servlet -->
+    <servlet>
+        <description>User deletion servlet.</description>
+        <servlet-name>UserDelete</servlet-name>
+        <servlet-class>net.sourceforge.guacamole.net.basic.crud.users.Delete</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>UserDelete</servlet-name>
+        <url-pattern>/users/delete</url-pattern>
+    </servlet-mapping>
+
     <!-- Permission List Servlet -->
     <servlet>
         <description>Permission list servlet.</description>