diff --git a/app/controllers/ingredients_controller.rb b/app/controllers/ingredients_controller.rb
new file mode 100644
index 0000000..f97a4d3
--- /dev/null
+++ b/app/controllers/ingredients_controller.rb
@@ -0,0 +1,11 @@
+class IngredientsController < ApplicationController
+
+  def index
+  end
+
+  def create
+  end
+
+  def destroy
+  end
+end
diff --git a/app/helpers/ingredients_helper.rb b/app/helpers/ingredients_helper.rb
new file mode 100644
index 0000000..dd54783
--- /dev/null
+++ b/app/helpers/ingredients_helper.rb
@@ -0,0 +1,2 @@
+module IngredientsHelper
+end
diff --git a/app/views/body_trackers/_sidebar.html.erb b/app/views/body_trackers/_sidebar.html.erb
index d3c965b..9f50063 100644
--- a/app/views/body_trackers/_sidebar.html.erb
+++ b/app/views/body_trackers/_sidebar.html.erb
@@ -3,6 +3,11 @@
   <li><%= link_to t(".link_summary"), project_body_trackers_path(@project) %></li>
 </ul>
 
+<h3><%= t ".heading_diet" %></h3>
+<ul>
+  <li><%= link_to t(".link_ingredients"), project_ingredients_path(@project) %></li>
+</ul>
+
 <h3><%= t ".heading_common" %></h3>
 <ul>
   <li><%= link_to t(".link_quantities"), project_quantities_path(@project) %></li>
@@ -12,4 +17,3 @@
     <li><p><%= link_to t(".link_defaults"), defaults_project_body_trackers_path(@project),
       method: :post, data: {confirm: t(".confirm_defaults")} %></li>
   <% end %>
-</ul>
diff --git a/app/views/ingredients/create.html.erb b/app/views/ingredients/create.html.erb
new file mode 100644
index 0000000..7936ded
--- /dev/null
+++ b/app/views/ingredients/create.html.erb
@@ -0,0 +1 @@
+<h2>IngredientsController#create</h2>
diff --git a/app/views/ingredients/destroy.html.erb b/app/views/ingredients/destroy.html.erb
new file mode 100644
index 0000000..0e45f4e
--- /dev/null
+++ b/app/views/ingredients/destroy.html.erb
@@ -0,0 +1 @@
+<h2>IngredientsController#destroy</h2>
diff --git a/app/views/ingredients/index.html.erb b/app/views/ingredients/index.html.erb
new file mode 100644
index 0000000..01c25b5
--- /dev/null
+++ b/app/views/ingredients/index.html.erb
@@ -0,0 +1,47 @@
+<% content_for :sidebar do %>
+  <%= render :partial => 'body_trackers/sidebar' %>
+<% end %>
+
+<div class="contextual">
+  <% if User.current.allowed_to?(:manage_common, @project) %>
+    <%= link_to t(".heading_new_unit"), '#', :class => 'icon icon-add',
+      :onclick => 'showAndScrollTo("add-unit", "unit_shortname"); return false;' %>
+  <% end %>
+</div>
+
+<div id="add-unit" <%= 'style=display:none;' if @unit.errors.empty? %>>
+  <h2><%= t ".heading_new_unit" %></h2>
+
+  <%= labelled_form_for @unit,
+                        :url => project_units_path(@project),
+                        :html => {:id => 'unit-form'} do |f| %>
+    <%= render :partial => 'units/form', :locals => { :f => f } %>
+    <%= submit_tag l(:button_create) %>
+    <%= link_to l(:button_cancel), "#", :onclick => '$("#add-unit").hide()' %>
+  <% end %>
+  <hr>
+</div>
+
+<h2><%= t ".heading" %></h2>
+<% if @units.any? %>
+  <table class="list">
+    <thead>
+      <tr>
+        <th><%= l(:field_shortname) %></th>
+        <th><%= l(:field_name) %></th>
+        <th style="width:15%"><%= l(:field_action) %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @units.each do |u| %>
+        <tr id="unit-<%= u.id %>" class="unit">
+          <td class="shortname"><%= u.shortname %></td>
+          <td class="unitname"><%= u.name %></td>
+          <td><%= delete_link unit_path(u), data: {} %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d0efc19..41127d3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -17,8 +17,10 @@ en:
       heading: 'Summary'
     sidebar:
       heading_body_trackers: 'Body trackers'
+      heding_diet: 'Diet'
       heading_common: 'Common'
       link_summary: 'Summary'
+      link_ingredients: 'Ingredients'
       link_quantities: 'Quantities'
       link_units: 'Units'
       link_defaults: 'Load defaults'
diff --git a/config/routes.rb b/config/routes.rb
index 938673d..9cfaa3e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,7 +6,8 @@ resources :projects do
     resources :body_trackers, :only => [:index] do
       post 'defaults', on: :collection
     end
-    resources :units, :only => [:index, :create, :destroy]
+    resources :ingredients, :only => [:index, :create, :destroy]
     resources :quantities, :only => [:index, :create, :destroy]
+    resources :units, :only => [:index, :create, :destroy]
   end
 end
diff --git a/db/migrate/001_create_units.rb b/db/migrate/001_create_units.rb
index 413357f..c07cab2 100644
--- a/db/migrate/001_create_units.rb
+++ b/db/migrate/001_create_units.rb
@@ -18,6 +18,7 @@ class CreateUnits < ActiveRecord::Migration
     end
 
     create_table :ingredients do |t|
+      t.references :project
       t.string :name
       t.decimal :ref_amount
       t.references :ref_unit
diff --git a/test/functional/ingredients_controller_test.rb b/test/functional/ingredients_controller_test.rb
new file mode 100644
index 0000000..abd52e2
--- /dev/null
+++ b/test/functional/ingredients_controller_test.rb
@@ -0,0 +1,8 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+class IngredientsControllerTest < ActionController::TestCase
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end