diff --git a/blogapp/models.py b/blogapp/models.py
index c741af3..53058ee 100644
--- a/blogapp/models.py
+++ b/blogapp/models.py
@@ -11,7 +11,7 @@ class blogentry(models.Model):
 
 class blogcomment(models.Model):
     blogentry = models.ForeignKey(blogentry, on_delete=models.CASCADE)
-    user = models.ForeignKey(User)
+    user = models.ForeignKey(User, null = True)
     guestname = models.CharField(max_length=20)
     body = models.CharField(max_length=300)
     date = models.DateTimeField('date')
diff --git a/blogapp/templates/blogapp/blogdetail.html b/blogapp/templates/blogapp/blogdetail.html
index fa1cf14..75866ba 100644
--- a/blogapp/templates/blogapp/blogdetail.html
+++ b/blogapp/templates/blogapp/blogdetail.html
@@ -12,17 +12,36 @@
 {% endautoescape %}
 
 
+<b>Comments total: {{blogentry.blogcomment_set.all.count}}</b><br/>
 
+{% if commentform %}
+<form action="" method="post">
+	{% csrf_token %}
+  	Your Name:<br>
+  	{{ commentform.guestname }}
+	<br/>Your Comment:<br/>
+	{{ commentform.blogcomment }}<br>
+	<input type="submit" value="Submit" />
+</form>
+{% endif %}
+
+{% for comment in blogentry.blogcomment_set.all %}
+{% if comment.user %}
+<h3>{{ comment.user.username }} says:</h3>
+{% else %}
+<h3>{{ comment.guestname }} says:</h3>
+{% endif %}
+{{ comment.body|linebreaks }}<br/>
+<small>{{ comment.date }}</small>
+{% endfor %}
 {% if false %}
-<b>Comments total: {{newsentry.newscomment_set.all.count}}</b><br/>
-{% for newscomment in newsentry.newscomment_set.all %}
 <table class="forumentry">
 <tr>
 	<td align="center" style="border-top:1px; width: 80px; solid #b2c9d5;"><img src="/polylux/{{ newscomment.user.get_profile.getImage }}"></img></td>
 	<td style="border-top:1px solid #b2c9d5;"><br/><a href="/blackmesa/usermanager/detail/{{newscomment.user.id}}/">{{newscomment.user.username}}</a><br>{{ newscomment.commenttext|linebreaks|urlize }}<br/><small>Datum: {{newscomment.date}}</small></td>
 </tr>
 </table>
-{% endfor %}
+
 
 <table
 style="text-align: left; width: 75%; margin-left: auto; margin-right: auto;"
diff --git a/blogapp/templates/blogapp/blogindex.html b/blogapp/templates/blogapp/blogindex.html
index 53768ad..53f7015 100644
--- a/blogapp/templates/blogapp/blogindex.html
+++ b/blogapp/templates/blogapp/blogindex.html
@@ -7,11 +7,11 @@
 {% autoescape off %}
 {% if blogentries %}
 {% for blogentry in blogentries %}
-
+{% if blogentry.published %}
 <h1>{{ blogentry.header }}</h1>
 <small>posted on: {{blogentry.date}} by {{blogentry.user.username}}</small>
 <p>{{blogentry.intro|linebreaks}}</p><a href="{% url 'detail' blogentry.id %}">Read more...</a><br/>
-
+{% endif %}
 {% endfor %}
 {% else %}
 <p>No entries are available.</p>
diff --git a/blogapp/views.py b/blogapp/views.py
index c1f3b76..cfd11df 100644
--- a/blogapp/views.py
+++ b/blogapp/views.py
@@ -5,7 +5,8 @@ from django import forms
 import datetime
 
 class BlogCommentForm(forms.Form):
-	blogcomment = forms.CharField(widget=forms.Textarea(attrs={'rows':3, 'cols':30}))
+    guestname = forms.CharField()
+    blogcomment = forms.CharField(widget=forms.Textarea(attrs={'rows':3, 'cols':30}))
 
 
 def listall(request):
@@ -13,13 +14,14 @@ def listall(request):
 	return render_to_response('blogapp/blogindex.html', {'blogentries': listall_entries}, context_instance=RequestContext(request))
 
 def detail(request, blogentry_id):
-	blogdetail = get_object_or_404(blogentry, pk=blogentry_id)
+    blogdetail = get_object_or_404(blogentry, pk=blogentry_id)
 
-	form = BlogCommentForm()
-	if request.user.is_authenticated():
-		return render_to_response('blogapp/blogdetail.html', {'blogentry': blogdetail, 'commentform': form}, context_instance=RequestContext(request))
-	else:
-		return render_to_response('blogapp/blogdetail.html', {'blogentry': blogdetail}, context_instance=RequestContext(request))
+    form = BlogCommentForm()
+    return render_to_response('blogapp/blogdetail.html', {'blogentry': blogdetail, 'commentform': form}, context_instance=RequestContext(request))
+	#if request.user.is_authenticated():
+	#	return render_to_response('blogapp/blogdetail.html', {'blogentry': blogdetail, 'commentform': form}, context_instance=RequestContext(request))
+	#else:
+	#	return render_to_response('blogapp/blogdetail.html', {'blogentry': blogdetail}, context_instance=RequestContext(request))
 
 #def addarticle(request):
 #	if not request.user.is_staff:
diff --git a/polysite/urls.py b/polysite/urls.py
index 5ebe9c2..b804cdc 100644
--- a/polysite/urls.py
+++ b/polysite/urls.py
@@ -23,5 +23,5 @@ urlpatterns = [
     url(r'^admin/', admin.site.urls),
     url(r'^about/', aboutpage, name='about'),
     url(r'^contact/', contactpage, name='contact'),
-    url(r'^', listall),
+   # url(r'^', listall),
 ]