diff --git a/ipv6ula/templates/ipv6ula/bookmarkmodel_form.html b/ipv6ula/templates/ipv6ula/ula_form.html
similarity index 82%
rename from ipv6ula/templates/ipv6ula/bookmarkmodel_form.html
rename to ipv6ula/templates/ipv6ula/ula_form.html
index 71ef1b8..494b8a1 100644
--- a/ipv6ula/templates/ipv6ula/bookmarkmodel_form.html
+++ b/ipv6ula/templates/ipv6ula/ula_form.html
@@ -7,7 +7,7 @@
 <form method="post">
   {% csrf_token %}
   {{ form|crispy }}
-  <input type="submit" value="Submit URL">
+  <input type="submit" value="Submit">
 </form>
 </div>
 
diff --git a/ipv6ula/urls.py b/ipv6ula/urls.py
index 93ece4b..6238506 100644
--- a/ipv6ula/urls.py
+++ b/ipv6ula/urls.py
@@ -20,8 +20,8 @@ from ipv6ula import views
 
 urlpatterns = [
     path('', views.IndexView.as_view(), name='index'),
-#    path('submit/', views.SubmitView.as_view(), name='submit'),
-#    path('login/', views.LoginView.as_view(), name='login'),
-#    path('logout/', views.logout_view, name='logout'),
+    path('submit/', views.SubmitView.as_view(), name='submit'),
+    path('login/', views.LoginView.as_view(), name='login'),
+    path('logout/', views.logout_view, name='logout'),
     path('admin/', admin.site.urls),
 ]
diff --git a/ipv6ula/views.py b/ipv6ula/views.py
index 96f8376..84b4d8d 100644
--- a/ipv6ula/views.py
+++ b/ipv6ula/views.py
@@ -15,31 +15,19 @@ class IndexView(ListView):
     paginate_by = 50
     queryset = ULA.objects.order_by('prefix')
 
-# class SubmitView(LoginRequiredMixin, CreateView):
-#     model = BookmarkModel
-#     fields = [ 'comment', 'url' ]
-#     login_url = '/login/'
-#     success_url = '/'
+class SubmitView(LoginRequiredMixin, CreateView):
+    model = ULA
+    fields = [ 'prefix', 'name', 'organization', 'website' ]
+    login_url = '/login/'
+    success_url = '/'
 
-#     def get_context_data(self, **kwargs):
-#         context = super(CreateView, self).get_context_data(**kwargs)
-#         context['site_name'] = settings.SITE_NAME
-#         context['site_description'] = settings.SITE_DESCRIPTION
+    def form_valid(self, form):
+        form.instance.owner = self.request.user
+        return super(SubmitView, self).form_valid(form)
 
-#         return context
+class LoginView(auth_views.LoginView):
+    template_name = 'ipv6ula/login.html'
 
-#     def form_valid(self, form):
-#         form.instance.owner = self.request.user
-#         return super(SubmitView, self).form_valid(form)
-
-# class LoginView(auth_views.LoginView):
-#     template_name = 'ipv6ula/login.html'
-#     extra_context = {}
-
-#     extra_context['site_name'] = settings.SITE_NAME
-#     extra_context['site_description'] = settings.SITE_DESCRIPTION
-
-
-# def logout_view(request):
-#     logout(request)
-#     return redirect("/")
+def logout_view(request):
+    logout(request)
+    return redirect("/")