diff --git a/.gitignore b/.gitignore
index 364ef42..259282f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.pyc
 *.sqlite
 media/*
+static_common/css/.sass-cache/*
diff --git a/pastebin/forms.py b/pastebin/forms.py
new file mode 100644
index 0000000..da9ce60
--- /dev/null
+++ b/pastebin/forms.py
@@ -0,0 +1,9 @@
+from django.forms import ModelForm
+
+from models import Geometry
+
+
+class GeometryForm(ModelForm):
+	class Meta:
+		model = Geometry
+		fields = ['name', 'description', 'file', 'sourcefile']
\ No newline at end of file
diff --git a/pastebin/models.py b/pastebin/models.py
index afaf7dc..793ce07 100644
--- a/pastebin/models.py
+++ b/pastebin/models.py
@@ -31,7 +31,7 @@ def safe_upload_path(base_dir):
 class Geometry(models.Model):
 	name = models.CharField(max_length = 128)
 	description = models.TextField(blank=True)
-	user = models.ForeignKey(User, blank=True)
+	user = models.ForeignKey(User, blank=True, null=True)
 	date = models.DateTimeField(auto_now_add=True)
 	polycount = models.IntegerField(blank=True, default=0)
 	width = models.FloatField(blank=True, default=0)
diff --git a/pastebin/templates/pastebin/geometry.html b/pastebin/templates/pastebin/geometry.html
index a7ea1cd..3c1069c 100644
--- a/pastebin/templates/pastebin/geometry.html
+++ b/pastebin/templates/pastebin/geometry.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
 
+{% block title %} {{ geometry.name }} {% endblock %}
+
 {% block headeraddons %}
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
   	<style>
@@ -108,7 +110,11 @@
           <i class="icon-user"> </i><b>by:</b>
         </div>
         <div class="pure-u-2-3">
-            {{geometry.user.username}}
+            {% if geometry.user %}
+              {{geometry.user.username}}
+            {% else %}
+              Anonymous
+            {% endif %}
         </div>
       </div>
       <div class="pure-g-r">
diff --git a/pastebin/templates/pastebin/geometry_create.html b/pastebin/templates/pastebin/geometry_create.html
new file mode 100644
index 0000000..c397aad
--- /dev/null
+++ b/pastebin/templates/pastebin/geometry_create.html
@@ -0,0 +1,40 @@
+{% extends "base.html" %}
+
+
+
+{% block content %}
+<div id="content">
+	<div id="prompt">
+  		<!-- if IE without GCF, prompt goes here -->
+	</div>
+	
+	<h1>New paste</h1>
+	<div class="pure-g-r">
+		<div class="pure-u-2-3">
+    		<div class="textcontainer">
+    			<form enctype="multipart/form-data" method="post" class="pure-form pure-form-aligned">
+    				{% csrf_token %}
+    				<fieldset>
+    					{% for field in form %}
+            				<div class="pure-control-group">
+            					{{ field.label_tag }} 
+       							{{ field }}
+       							{{ field.errors }}
+       						</div>
+    					{% endfor %}
+    					<div class="pure-control-group">
+    						<label for="submitbutton" >... and </label>
+    						<input  class="pure-button button-green" id="submitbutton" type="submit" value="Upload" />
+    					</div>
+    				</fieldset>
+				</form>
+    		</div>
+  		</div>
+  		<div class="pure-u-1-3">
+			<div class="textcontainer">
+
+    		</div>
+  		</div>
+	</div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/pastebin/urls.py b/pastebin/urls.py
index 4b502f1..8e5a8a2 100644
--- a/pastebin/urls.py
+++ b/pastebin/urls.py
@@ -1,6 +1,7 @@
 from django.conf.urls import patterns, include, url
 
-from views import GeometryView
+from views import GeometryView, GeometryCreate
 
 urlpatterns = patterns('',
-        (r'^g/(?P<id>\d+)/$', GeometryView.as_view()),)
\ No newline at end of file
+        url(r'^new/$', GeometryCreate.as_view()),
+        url(r'^g/(?P<id>\d+)/$', GeometryView.as_view(), name = 'geometry_details'))
\ No newline at end of file
diff --git a/pastebin/views.py b/pastebin/views.py
index d16b696..73eb926 100644
--- a/pastebin/views.py
+++ b/pastebin/views.py
@@ -1,5 +1,8 @@
+from django.views.generic.edit import CreateView
 from django.views.generic.detail import DetailView
+from django.core.urlresolvers import reverse
 
+from forms import GeometryForm
 from models import Geometry
 
 
@@ -7,4 +10,13 @@ class GeometryView(DetailView):
 	model = Geometry
 	pk_url_kwarg = 'id'
 	context_object_name = 'geometry'
-	template_name = 'pastebin/geometry.html'
\ No newline at end of file
+	template_name = 'pastebin/geometry.html'
+
+
+class GeometryCreate(CreateView):
+    model = Geometry
+    form_class = GeometryForm
+    template_name = 'pastebin/geometry_create.html'
+
+    def get_success_url(self):
+    	return reverse('geometry_details', kwargs={'id' :self.object.id})
\ No newline at end of file
diff --git a/static_common/css/layout.css b/static_common/css/layout.css
index 6b8d0e1..4d45b4d 100644
--- a/static_common/css/layout.css
+++ b/static_common/css/layout.css
@@ -41,6 +41,12 @@
   border-color: #eeeeee;
   border-radius: 3px;
   background-color: #eee; }
+  .textcontainer .pure-form label {
+    font-weight: bold;
+    border-bottom: 1px solid #ccc; }
+  .textcontainer .pure-form .errorlist {
+    list-style: none;
+    color: #e9322d; }
 
 .button-green {
   background-color: #1CB841;
diff --git a/static_common/css/layout.scss b/static_common/css/layout.scss
index 7cd8ae0..b2c7e12 100644
--- a/static_common/css/layout.scss
+++ b/static_common/css/layout.scss
@@ -53,8 +53,22 @@
 	@include gridcontainer;
 	@include roundconers(#eee,6px);
 	background-color: #eee;
+
+	.pure-form {
+		label {
+			font-weight: bold;
+			border-bottom: 1px solid #ccc;
+		}
+
+		.errorlist {
+			list-style: none;
+			color: #e9322d;
+		}
+	}
 }
 
+
+
 .button-green {
 	background-color: #1CB841;
 	color: #ffffff;
diff --git a/templates/base.html b/templates/base.html
index 7422a8e..e921c48 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-	<title>past3d :: {{ title }} </title>
+	<title>past3d :: {% block title %}{% endblock %}</title>
 
   <link rel="stylesheet" href="{{STATIC_URL}}css/pure/pure-min.css">