diff --git a/inventory/admin.py b/inventory/admin.py
index f154200..184b1f4 100644
--- a/inventory/admin.py
+++ b/inventory/admin.py
@@ -67,8 +67,7 @@ class PantryItemAdmin(admin.ModelAdmin):
     autocomplete_fields = ['category', 'unit']
     inlines = [PantryItemInLine]
 
-    # TODO: make category a model
-    # autocomplete_fields = ['category',]
+    autocomplete_fields = ['category',]
     fields = (
         'name',
         'category',
diff --git a/inventory/models.py b/inventory/models.py
index 4276539..e515215 100644
--- a/inventory/models.py
+++ b/inventory/models.py
@@ -85,7 +85,7 @@ class PantryItemLine(models.Model):
         return self.pantry_item.unit
 
     def get_absolute_url(self):
-        return reverse('pantryitemlinedetail', kwargs={'pk': self.pk})
+        return reverse('im:pantryitemlinedetail', kwargs={'pk': self.pk})
 
     def __str__(self):
         return ' '.join([str(x) for x in [self.pantry_item.name,  self.quantity, 'X',
diff --git a/inventory/templates/inventory/base.html b/inventory/templates/inventory/base.html
index 391d11d..94ca2e6 100644
--- a/inventory/templates/inventory/base.html
+++ b/inventory/templates/inventory/base.html
@@ -18,7 +18,7 @@
   <div class="collapse navbar-collapse" id="navbarSupportedContent">
     <ul class="navbar-nav mr-auto">
       <li class="nav-item">
-        <a class="nav-link"  href="{% url 'im:consume' %} ">Consume</a>
+        <a class="nav-link"  href="{% url 'im:consumelist' %} ">Consume</a>
       </li>
       <li class="nav-item">
         <a class="nav-link"  href="{% url 'admin:inventory_pantryitem_changelist' %} ">Add</a>
diff --git a/inventory/templates/inventory/consume.html b/inventory/templates/inventory/consume.html
index 8adc0fe..8253fc0 100644
--- a/inventory/templates/inventory/consume.html
+++ b/inventory/templates/inventory/consume.html
@@ -1,5 +1,10 @@
 {% extends 'inventory/base.html' %}
 
 {% block content %}
-TODO: add form to mark items as consumed
+<h1>Consume</h1>
+Change quantity for "{{ object }}"
+<form method="post">{% csrf_token %}
+    {{ form.as_p }}
+    <input type="submit" value="Update">
+</form>
 {% endblock %}
diff --git a/inventory/templates/inventory/consumelist.html b/inventory/templates/inventory/consumelist.html
new file mode 100644
index 0000000..7438aef
--- /dev/null
+++ b/inventory/templates/inventory/consumelist.html
@@ -0,0 +1,21 @@
+{% extends 'inventory/base.html' %}
+
+{% block content %}
+<h1>Consume</h1>
+{% if pis %}
+{% regroup pis by expiry_date as pis_by_date %}
+{% for date in pis_by_date %}
+    <div class="content">
+    <h2>{{ date.grouper|date:"d F Y" }}</h2>
+    <ul>
+    {% for pi in date.list %}
+        <li><a href="{% url 'im:consume' pi.id %}">{{ pi|title}}</a></li>
+    {% endfor %}
+    </ul>
+    </div>
+{% endfor %}
+{% else %}
+    <p>No Pantry Items are available.</p>
+{% endif %}
+
+{% endblock %}
diff --git a/inventory/templates/inventory/pantryitemline_detail.html b/inventory/templates/inventory/pantryitemline_detail.html
new file mode 100644
index 0000000..b202177
--- /dev/null
+++ b/inventory/templates/inventory/pantryitemline_detail.html
@@ -0,0 +1,6 @@
+{% extends 'inventory/base.html' %}
+
+{% block content %}
+<h1>Item Details</h1>
+{{ object }}
+{% endblock %}
diff --git a/inventory/urls.py b/inventory/urls.py
index d6dc1b8..16aa05c 100644
--- a/inventory/urls.py
+++ b/inventory/urls.py
@@ -4,7 +4,9 @@ from . import views
 app_name = 'im'
 urlpatterns = [
     path('', views.index, name='index'),
-    path('consume/', views.consume, name='consume'),
+    path('items/<pk>', views.PantryItemLineView.as_view(), name='pantryitemlinedetail'),
+    path('consume/', views.ConsumeList.as_view(), name='consumelist'),
+    path('consume/<pk>/', views.Consume.as_view(), name='consume'),
     path('shoppinglist/', views.Shoppinglist.as_view(), name='shoppinglist'),
     # TODO: add exiperes before X date?
     # TODO: add categories
diff --git a/inventory/views.py b/inventory/views.py
index a3791f0..871e7e9 100644
--- a/inventory/views.py
+++ b/inventory/views.py
@@ -12,10 +12,6 @@ def index(request):
     return render(request, "inventory/index.html")
 
 
-def consume(request):
-    return render(request, "inventory/consume.html")
-
-
 class Shoppinglist(generic.ListView):
     template_name = "inventory/shoppinglist.html"
     context_object_name = 'pis'
@@ -36,3 +32,25 @@ class Expirations(generic.ListView):
 
     def get_queryset(self):
         return PantryItemLine.objects.exclude(expiry_date__isnull=True).exclude(quantity=0).order_by('expiry_date')
+
+
+class ConsumeList(generic.ListView):
+    template_name = "inventory/consumelist.html"
+    context_object_name = 'pis'
+
+    def get_queryset(self):
+        return PantryItemLine.objects.exclude(quantity=0).order_by('expiry_date')
+
+
+class Consume(generic.UpdateView):
+    template_name = "inventory/consume.html"
+    fields = ['quantity']
+
+    context_object_name = 'pis'
+
+    def get_queryset(self):
+        return PantryItemLine.objects.exclude(quantity=0).order_by('expiry_date')
+
+
+class PantryItemLineView(generic.DetailView):
+    model = PantryItemLine