diff --git a/Gemfile b/Gemfile
index 30dc851..b9ff15f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,13 +1,20 @@
 source 'https://rubygems.org'
-ruby '2.2.3'
+# ruby '2.2.3'
 gem 'rails', '4.2.5'
-gem 'sqlite3'
+# gem 'sqlite3'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
 gem 'coffee-rails', '~> 4.1.0'
 gem 'jquery-rails'
 gem 'turbolinks'
 gem 'jbuilder', '~> 2.0'
+gem 'mysql2'
+gem 'simple_form'
+
+
+
+
+
 group :development, :test do
   gem 'byebug'
 end
@@ -29,6 +36,8 @@ group :development, :test do
   gem 'factory_girl_rails'
   gem 'faker'
   gem 'rspec-rails'
+  gem 'shoulda-matchers', '~> 3.1'
+
 end
 group :test do
   gem 'capybara'
diff --git a/Gemfile.lock b/Gemfile.lock
index eaf49ee..2e9c165 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -111,6 +111,7 @@ GEM
     mini_portile (0.6.2)
     minitest (5.8.2)
     multi_json (1.11.2)
+    mysql2 (0.4.4)
     nokogiri (1.6.6.3)
       mini_portile (~> 0.6.0)
     orm_adapter (0.5.0)
@@ -179,6 +180,11 @@ GEM
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
+    shoulda-matchers (3.1.1)
+      activesupport (>= 4.0.0)
+    simple_form (3.2.1)
+      actionpack (> 4, < 5.1)
+      activemodel (> 4, < 5.1)
     spring (1.4.3)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
@@ -188,7 +194,6 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.11)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.1)
@@ -227,6 +232,7 @@ DEPENDENCIES
   jbuilder (~> 2.0)
   jquery-rails
   launchy
+  mysql2
   pundit
   quiet_assets
   rails (= 4.2.5)
@@ -234,12 +240,13 @@ DEPENDENCIES
   rspec-rails
   sass-rails (~> 5.0)
   selenium-webdriver
+  shoulda-matchers (~> 3.1)
+  simple_form
   spring
   spring-commands-rspec
-  sqlite3
   turbolinks
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
 
 BUNDLED WITH
-   1.10.6
+   1.12.5
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index a443db3..88dc3f7 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -10,6 +10,7 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
+ *= require styles
  *= require_tree .
  *= require_self
  */
diff --git a/app/assets/stylesheets/styles.scss b/app/assets/stylesheets/styles.scss
new file mode 100644
index 0000000..904ae87
--- /dev/null
+++ b/app/assets/stylesheets/styles.scss
@@ -0,0 +1,18 @@
+.v-spacer1 {
+  height: 1em;
+}
+
+.text-red {
+  color: red;
+}
+
+.label-colour-display {
+  width: 100px;
+  height: 15px;
+  vertical-align: bottom;
+  margin-left: 10px;
+}
+
+span.label {
+  padding: 5px 30px;
+}
\ No newline at end of file
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d83690e..a75b747 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,5 +1,15 @@
 class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
+  include Pundit
   protect_from_forgery with: :exception
+
+  rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
+
+  private
+
+  def user_not_authorized
+    flash[:alert] = "Access Denied. You are not authorized to perform this action."
+    redirect_to(request.referrer || root_path)
+  end
 end
diff --git a/app/controllers/labels_controller.rb b/app/controllers/labels_controller.rb
new file mode 100644
index 0000000..7abe8a1
--- /dev/null
+++ b/app/controllers/labels_controller.rb
@@ -0,0 +1,76 @@
+class LabelsController < ApplicationController
+  before_action :authenticate_user!
+  after_action :verify_authorized
+
+  before_action :set_label, :only => [:edit, :update, :destroy]
+
+
+  def index
+    authorize Label
+    @labels = Label.all
+  end
+
+  def new
+    authorize Label
+    @label = Label.new
+  end
+
+  def edit
+    authorize Label
+
+  end
+
+  def create
+    @label = Label.new(permitted_label_params)
+    authorize Label
+
+    if @label.save
+      flash[:success] = 'Label successfully created!'
+      @labels = Label.all
+      render 'labels/index'
+    else
+      flash[:error] = @label.errors.full_messages.join('<br>').html_safe
+      render 'labels/new'
+    end
+  end
+
+  def update
+    authorize Label
+    if @label.update(permitted_label_params)
+      flash[:success] = 'Label successfully updated!'
+      @labels = Label.all
+      render 'labels/index'
+    else
+      flash[:error] = @label.errors.full_messages.join('<br>').html_safe
+      render 'labels/edit'
+
+    end
+
+
+  end
+
+  def destroy
+    authorize Label
+
+    @label.destroy
+    flash[:success] = 'Label Successfully destroyed'
+
+    @labels = Label.all
+    render 'labels/index'
+  end
+
+  private
+  def set_label
+    begin
+      @label = Label.find(params[:id])
+    rescue ActiveRecord::RecordNotFound => e
+      flash[:error] = 'Label not found'
+      render 'errors/index'
+    end
+  end
+
+  def permitted_label_params
+    params.require(:label).permit(:name, :colour)
+  end
+
+end
diff --git a/app/controllers/user_labels_controller.rb b/app/controllers/user_labels_controller.rb
new file mode 100644
index 0000000..366ddda
--- /dev/null
+++ b/app/controllers/user_labels_controller.rb
@@ -0,0 +1,72 @@
+class UserLabelsController < ApplicationController
+  before_action :authenticate_user!
+  after_action :verify_authorized
+
+  before_action :set_user_label, :only => [:edit, :update, :destroy]
+
+  def index
+    authorize UserLabel
+    @user_labels = UserLabel.all
+  end
+
+  def new
+    authorize UserLabel
+    @user_label = UserLabel.new
+  end
+
+  def create
+    @user_label = UserLabel.new(permitted_user_label_params)
+    authorize UserLabel
+
+    if @user_label.save
+      flash[:success] = 'Label for user successfully created'
+      @user_labels = UserLabel.all
+      render 'user_labels/index'
+    else
+      flash[:error] = @user_label.errors.full_messages.join('<br>').html_safe
+      render 'user_labels/new'
+    end
+  end
+
+  def edit
+    authorize UserLabel
+
+  end
+
+  def update
+    authorize UserLabel
+    if @user_label.update(permitted_user_label_params)
+      flash[:success] = 'User Label successfully updated!'
+      @user_labels = UserLabel.all
+      render 'user_labels/index'
+    else
+      flash[:error] = @user_label.errors.full_messages.join('<br>').html_safe
+      render 'user_labels/edit'
+
+    end
+  end
+
+  def destroy
+    authorize UserLabel
+    @user_label.destroy
+    flash[:success] = 'User Label Successfully destroyed'
+
+    @user_labels = UserLabel.all
+    render 'user_labels/index'
+  end
+
+  private
+  def set_user_label
+    begin
+      @user_label = UserLabel.find(params[:id])
+    rescue ActiveRecord::RecordNotFound => e
+      flash[:error] = 'User Label not found'
+      render 'errors/index'
+    end
+  end
+  def permitted_user_label_params
+    params.require(:user_label).permit(:user_id, :label_id)
+  end
+
+
+end
\ No newline at end of file
diff --git a/app/controllers/visitors_controller.rb b/app/controllers/visitors_controller.rb
index ebe5fb6..9ef4052 100644
--- a/app/controllers/visitors_controller.rb
+++ b/app/controllers/visitors_controller.rb
@@ -1,2 +1,4 @@
 class VisitorsController < ApplicationController
+  def index
+  end
 end
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
new file mode 100644
index 0000000..9802e31
--- /dev/null
+++ b/app/helpers/labels_helper.rb
@@ -0,0 +1,2 @@
+module LabelsHelper
+end
diff --git a/app/models/label.rb b/app/models/label.rb
new file mode 100644
index 0000000..cd28a6d
--- /dev/null
+++ b/app/models/label.rb
@@ -0,0 +1,7 @@
+class Label < ActiveRecord::Base
+  validates_presence_of :name, :colour
+  validates_uniqueness_of :colour, scope: :name, message: "- Label already has this colour"
+
+  has_many :user_labels, :dependent => :destroy
+
+end
\ No newline at end of file
diff --git a/app/models/user.rb b/app/models/user.rb
index 9e36969..df5306a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2,6 +2,8 @@ class User < ActiveRecord::Base
   enum role: [:user, :vip, :admin]
   after_initialize :set_default_role, :if => :new_record?
 
+  has_many :user_labels
+
   def set_default_role
     self.role ||= :user
   end
diff --git a/app/models/user_label.rb b/app/models/user_label.rb
new file mode 100644
index 0000000..e1807d9
--- /dev/null
+++ b/app/models/user_label.rb
@@ -0,0 +1,9 @@
+class UserLabel < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :label
+
+  validates_presence_of :user_id, :label_id
+  validates_uniqueness_of :label_id, scope: :user_id, message: " already has this label."
+
+
+end
\ No newline at end of file
diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb
new file mode 100644
index 0000000..c4b9c4b
--- /dev/null
+++ b/app/policies/application_policy.rb
@@ -0,0 +1,53 @@
+class ApplicationPolicy
+  attr_reader :user, :record
+
+  def initialize(user, record)
+    @user = user
+    @record = record
+  end
+
+  def index?
+    @user.admin?
+  end
+
+  # def show?
+  #   @user.admin?
+  # end
+
+  def create?
+    @user.admin?
+  end
+
+  def new?
+    @user.admin?
+  end
+
+  def update?
+    @user.admin?
+  end
+
+  def edit?
+    @user.admin?
+  end
+
+  def destroy?
+    @user.admin?
+  end
+
+  def scope
+    Pundit.policy_scope!(user, record.class)
+  end
+
+  class Scope
+    attr_reader :user, :scope
+
+    def initialize(user, scope)
+      @user = user
+      @scope = scope
+    end
+
+    def resolve
+      scope
+    end
+  end
+end
diff --git a/app/policies/label_policy.rb b/app/policies/label_policy.rb
new file mode 100644
index 0000000..d6bb415
--- /dev/null
+++ b/app/policies/label_policy.rb
@@ -0,0 +1,3 @@
+class LabelPolicy < ApplicationPolicy
+
+end
diff --git a/app/policies/user_label_policy.rb b/app/policies/user_label_policy.rb
new file mode 100644
index 0000000..54fb4e6
--- /dev/null
+++ b/app/policies/user_label_policy.rb
@@ -0,0 +1,3 @@
+class UserLabelPolicy < ApplicationPolicy
+
+end
diff --git a/app/views/errors/index.html.erb b/app/views/errors/index.html.erb
new file mode 100644
index 0000000..4e5e50c
--- /dev/null
+++ b/app/views/errors/index.html.erb
@@ -0,0 +1,3 @@
+<span class="text-red">
+  <%= flash[:error] %>
+</span>
\ No newline at end of file
diff --git a/app/views/labels/_form.html.erb b/app/views/labels/_form.html.erb
new file mode 100644
index 0000000..8900835
--- /dev/null
+++ b/app/views/labels/_form.html.erb
@@ -0,0 +1,12 @@
+<%= simple_form_for @label, :html => { :class => 'form-horizontal' } do |f| %>
+    <%= f.input :name %>
+    <div class="form-group string required label_colour">
+      <%= f.label 'Colour' %>
+      <%= f.color_field :colour %>
+    </div>
+
+
+    <%= f.button :submit, :class => 'btn-primary' %>
+    <%= link_to 'Cancel',
+                labels_path, :class => 'btn btn-default' %>
+<% end %>
diff --git a/app/views/labels/_label.html.erb b/app/views/labels/_label.html.erb
new file mode 100644
index 0000000..21ad155
--- /dev/null
+++ b/app/views/labels/_label.html.erb
@@ -0,0 +1,16 @@
+  <td><%= link_to label.id, label_path(label) %></td>
+  <td><%= label.name %></td>
+  <td>
+    <label>
+      <%= label.colour %>
+    </label>
+    <label class="label-colour-display" style="background-color: <%=label.colour %>"></label>
+  </td>
+  <td>
+    <%= link_to 'Edit', edit_label_path(label), :class => 'btn btn-default btn-xs' %>
+    <%= link_to 'Destroy',
+                label_path(label),
+                :method => :delete,
+                :data => { :confirm =>  'Are you sure? this will delete all associated user labels.' },
+                :class => 'btn btn-xs btn-danger' %>
+  </td>
diff --git a/app/views/labels/edit.html.erb b/app/views/labels/edit.html.erb
new file mode 100644
index 0000000..512da19
--- /dev/null
+++ b/app/views/labels/edit.html.erb
@@ -0,0 +1,11 @@
+<%- model_class = Label -%>
+
+<div class="container">
+  <div class="page-header">
+    <h1>
+      Edit Label
+    </h1>
+  </div>
+  <%= render :partial => 'form' %>
+
+</div>
diff --git a/app/views/labels/index.html.erb b/app/views/labels/index.html.erb
new file mode 100644
index 0000000..05fa987
--- /dev/null
+++ b/app/views/labels/index.html.erb
@@ -0,0 +1,30 @@
+<%- model_class = Label -%>
+<div class="page-header">
+  <h1><%= model_class.model_name.human.pluralize.titleize %></h1>
+</div>
+<table class="table table-striped">
+  <thead>
+  <tr>
+    <th><%= model_class.human_attribute_name(:id) %></th>
+    <th><%= model_class.human_attribute_name(:name) %></th>
+    <th><%= model_class.human_attribute_name(:colour) %></th>
+    <th>Edit/Delete</th>
+  </tr>
+  </thead>
+  <tbody>
+  <% if @labels.empty? %>
+      <tr>No labels.</tr>
+  <% else %>
+      <% @labels.each do |label| %>
+          <tr>
+            <%= render label %>
+          </tr>
+      <% end %>
+  <% end %>
+  </tbody>
+
+</table>
+
+<%= link_to 'New Label',
+            new_label_path,
+            :class => 'btn btn-primary' %>
diff --git a/app/views/labels/new.html.erb b/app/views/labels/new.html.erb
new file mode 100644
index 0000000..fc9f65f
--- /dev/null
+++ b/app/views/labels/new.html.erb
@@ -0,0 +1,8 @@
+<%- model_class = Label -%>
+<div class="container">
+  <div class="page-header">
+    <h1>New Label</h1>
+  </div>
+  <%= render :partial => 'form' %>
+</div>
+
diff --git a/app/views/layouts/_messages.html.erb b/app/views/layouts/_messages.html.erb
index bc129fb..bb066e4 100644
--- a/app/views/layouts/_messages.html.erb
+++ b/app/views/layouts/_messages.html.erb
@@ -1,7 +1,7 @@
 <%# Rails flash messages styled for Bootstrap 3.0 %>
 <% flash.each do |name, msg| %>
   <% if msg.is_a?(String) %>
-    <div class="alert alert-<%= name.to_s == 'notice' ? 'success' : 'danger' %>">
+    <div class="alert alert-<%= (name.to_s == 'notice' or name.to_s == 'success') ? 'success' : 'danger' %>">
       <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
       <%= content_tag :div, msg, :id => "flash_#{name}" %>
     </div>
diff --git a/app/views/layouts/_nav_links_for_auth.html.erb b/app/views/layouts/_nav_links_for_auth.html.erb
index f1efe2f..badc8e3 100644
--- a/app/views/layouts/_nav_links_for_auth.html.erb
+++ b/app/views/layouts/_nav_links_for_auth.html.erb
@@ -8,5 +8,8 @@
 <% if user_signed_in? %>
   <% if current_user.try(:admin?) %>
     <li><%= link_to 'Users', users_path %></li>
-  <% end %>
+    <li><%= link_to 'Labels', labels_path %></li>
+    <li><%= link_to 'User Labels', user_labels_path %></li>
+
+    <% end %>
 <% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 8edb5c2..90176db 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -13,8 +13,10 @@
       <%= render 'layouts/navigation' %>
     </header>
     <main role="main">
+      <div class="v-spacer1"></div>
        <%= render 'layouts/messages' %>
        <%= yield %>
     </main>
+
   </body>
 </html>
diff --git a/app/views/layouts/partials/_footer.html.erb b/app/views/layouts/partials/_footer.html.erb
new file mode 100644
index 0000000..a5a279b
--- /dev/null
+++ b/app/views/layouts/partials/_footer.html.erb
@@ -0,0 +1 @@
+<!--Shile F - Younility, 2016-->
diff --git a/app/views/user_labels/_form.html.erb b/app/views/user_labels/_form.html.erb
new file mode 100644
index 0000000..c76a227
--- /dev/null
+++ b/app/views/user_labels/_form.html.erb
@@ -0,0 +1,14 @@
+<%= simple_form_for @user_label, :html => { :class => 'form-horizontal' } do |f| %>
+
+    <%= f.input 'User' do %>
+        <%= f.select :user_id, User.all.map { |u| [u.name, u.id] },  {include_blank: 'Select User..'}, { :class => 'form-control' } %>
+    <% end %>
+
+    <%= f.input 'Label' do %>
+        <%= f.select :label_id, Label.all.map { |l| [l.name, l.id] },  {include_blank: 'Select Label..'}, { :class => 'form-control' } %>
+    <% end %>
+
+    <%= f.button :submit, :class => 'btn-primary' %>
+    <%= link_to 'Cancel',
+                labels_path, :class => 'btn btn-default' %>
+<% end %>
diff --git a/app/views/user_labels/_user_label.html.erb b/app/views/user_labels/_user_label.html.erb
new file mode 100644
index 0000000..f2fd14c
--- /dev/null
+++ b/app/views/user_labels/_user_label.html.erb
@@ -0,0 +1,16 @@
+<td><%= link_to user_label.id, user_label_path(user_label) %></td>
+<td><%= user_label.user.name %></td>
+<td>
+  <label>
+    <%= user_label.label.name %>
+  </label>
+  <label class="label-colour-display" style="background-color: <%= user_label.label.colour %>"></label>
+</td>
+<td>
+  <%= link_to 'Edit', edit_user_label_path(user_label), :class => 'btn btn-default btn-xs' %>
+  <%= link_to 'Destroy',
+              user_label_path(user_label),
+              :method => :delete,
+              :data => { :confirm =>  'Are you sure?' },
+              :class => 'btn btn-xs btn-danger' %>
+</td>
diff --git a/app/views/user_labels/edit.html.erb b/app/views/user_labels/edit.html.erb
new file mode 100644
index 0000000..267b342
--- /dev/null
+++ b/app/views/user_labels/edit.html.erb
@@ -0,0 +1,11 @@
+<%- model_class = UserLabel -%>
+
+<div class="container">
+  <div class="page-header">
+    <h1>
+      Edit User Label
+    </h1>
+  </div>
+  <%= render :partial => 'form' %>
+
+</div>
diff --git a/app/views/user_labels/index.html.erb b/app/views/user_labels/index.html.erb
new file mode 100644
index 0000000..f8eedb9
--- /dev/null
+++ b/app/views/user_labels/index.html.erb
@@ -0,0 +1,30 @@
+<%- model_class = UserLabel -%>
+<div class="page-header">
+  <h1><%= model_class.model_name.human.pluralize.titleize %></h1>
+</div>
+<table class="table table-striped">
+  <thead>
+  <tr>
+    <th><%= model_class.human_attribute_name(:id) %></th>
+    <th><%= model_class.human_attribute_name(:name) %></th>
+    <th><%= model_class.human_attribute_name(:colour) %></th>
+    <th>Edit/Delete</th>
+  </tr>
+  </thead>
+  <tbody>
+  <% if @user_labels.empty? %>
+      <tr>No user labels.</tr>
+  <% else %>
+      <% @user_labels.each do |user_label| %>
+          <tr>
+            <%= render user_label %>
+          </tr>
+      <% end %>
+  <% end %>
+  </tbody>
+
+</table>
+
+<%= link_to 'New User Label',
+            new_user_label_path,
+            :class => 'btn btn-primary' %>
diff --git a/app/views/user_labels/new.html.erb b/app/views/user_labels/new.html.erb
new file mode 100644
index 0000000..c0ef0bd
--- /dev/null
+++ b/app/views/user_labels/new.html.erb
@@ -0,0 +1,8 @@
+<%- model_class = UserLabel -%>
+<div class="container">
+  <div class="page-header">
+    <h1>New User Label</h1>
+  </div>
+  <%= render :partial => 'form' %>
+</div>
+
diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index f1a3d7c..9d1cfcb 100644
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -1,6 +1,16 @@
 <td>
   <%= link_to user.email, user %>
 </td>
+<td>
+  <% user_labels = user.user_labels %>
+  <% user_labels.each do |ub| %>
+  <p>
+    <span class="label" style="background-color: <%= ub.label.colour %> ">
+      <%= ub.label.name %>
+    </span>
+  </p>
+  <% end %>
+</td>
 <td>
   <%= form_for(user) do |f| %>
     <%= f.select(:role, User.roles.keys.map {|role| [role.titleize,role]}) %>
diff --git a/config/database.yml b/config/database.yml
index 1c1a37c..d12ebb3 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -5,21 +5,23 @@
 #   gem 'sqlite3'
 #
 default: &default
-  adapter: sqlite3
+  adapter: mysql2
+  encoding: utf8
   pool: 5
-  timeout: 5000
+  username: root
+  password: password
+  host: localhost
+  wait_timeout: 300
 
 development:
   <<: *default
-  database: db/development.sqlite3
+  database: younility_test
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: db/test.sqlite3
+  database: younility_test
 
 production:
   <<: *default
-  database: db/production.sqlite3
+  database: younility_test
+
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 7b80d76..0e85e49 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -12,7 +12,7 @@
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = 'no-reply@' + Rails.application.secrets.domain_name
+  # config.mailer_sender = 'no-reply@' + Rails.application.secrets.domain_name
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
new file mode 100644
index 0000000..934487a
--- /dev/null
+++ b/config/initializers/simple_form.rb
@@ -0,0 +1,165 @@
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  # Wrappers are used by the form builder to generate a
+  # complete input. You can remove any component from the
+  # wrapper, change the order or even add your own to the
+  # stack. The options given below are used to wrap the
+  # whole input.
+  config.wrappers :default, class: :input,
+    hint_class: :field_with_hint, error_class: :field_with_errors do |b|
+    ## Extensions enabled by default
+    # Any of these extensions can be disabled for a
+    # given input by passing: `f.input EXTENSION_NAME => false`.
+    # You can make any of these extensions optional by
+    # renaming `b.use` to `b.optional`.
+
+    # Determines whether to use HTML5 (:email, :url, ...)
+    # and required attributes
+    b.use :html5
+
+    # Calculates placeholders automatically from I18n
+    # You can also pass a string as f.input placeholder: "Placeholder"
+    b.use :placeholder
+
+    ## Optional extensions
+    # They are disabled unless you pass `f.input EXTENSION_NAME => true`
+    # to the input. If so, they will retrieve the values from the model
+    # if any exists. If you want to enable any of those
+    # extensions by default, you can change `b.optional` to `b.use`.
+
+    # Calculates maxlength from length validations for string inputs
+    b.optional :maxlength
+
+    # Calculates pattern from format validations for string inputs
+    b.optional :pattern
+
+    # Calculates min and max from length validations for numeric inputs
+    b.optional :min_max
+
+    # Calculates readonly automatically from readonly attributes
+    b.optional :readonly
+
+    ## Inputs
+    b.use :label_input
+    b.use :hint,  wrap_with: { tag: :span, class: :hint }
+    b.use :error, wrap_with: { tag: :span, class: :error }
+
+    ## full_messages_for
+    # If you want to display the full error message for the attribute, you can
+    # use the component :full_error, like:
+    #
+    # b.use :full_error, wrap_with: { tag: :span, class: :error }
+  end
+
+  # The default wrapper to be used by the FormBuilder.
+  config.default_wrapper = :default
+
+  # Define the way to render check boxes / radio buttons with labels.
+  # Defaults to :nested for bootstrap config.
+  #   inline: input + label
+  #   nested: label > input
+  config.boolean_style = :nested
+
+  # Default class for buttons
+  config.button_class = 'btn'
+
+  # Method used to tidy up errors. Specify any Rails Array method.
+  # :first lists the first message for each field.
+  # Use :to_sentence to list all errors for each field.
+  # config.error_method = :first
+
+  # Default tag used for error notification helper.
+  config.error_notification_tag = :div
+
+  # CSS class to add for error notification helper.
+  config.error_notification_class = 'error_notification'
+
+  # ID to add for error notification helper.
+  # config.error_notification_id = nil
+
+  # Series of attempts to detect a default label method for collection.
+  # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
+
+  # Series of attempts to detect a default value method for collection.
+  # config.collection_value_methods = [ :id, :to_s ]
+
+  # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
+  # config.collection_wrapper_tag = nil
+
+  # You can define the class to use on all collection wrappers. Defaulting to none.
+  # config.collection_wrapper_class = nil
+
+  # You can wrap each item in a collection of radio/check boxes with a tag,
+  # defaulting to :span.
+  # config.item_wrapper_tag = :span
+
+  # You can define a class to use in all item wrappers. Defaulting to none.
+  # config.item_wrapper_class = nil
+
+  # How the label text should be generated altogether with the required text.
+  # config.label_text = lambda { |label, required, explicit_label| "#{required} #{label}" }
+
+  # You can define the class to use on all labels. Default is nil.
+  # config.label_class = nil
+
+  # You can define the default class to be used on forms. Can be overriden
+  # with `html: { :class }`. Defaulting to none.
+  # config.default_form_class = nil
+
+  # You can define which elements should obtain additional classes
+  # config.generate_additional_classes_for = [:wrapper, :label, :input]
+
+  # Whether attributes are required by default (or not). Default is true.
+  # config.required_by_default = true
+
+  # Tell browsers whether to use the native HTML5 validations (novalidate form option).
+  # These validations are enabled in SimpleForm's internal config but disabled by default
+  # in this configuration, which is recommended due to some quirks from different browsers.
+  # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations,
+  # change this configuration to true.
+  config.browser_validations = false
+
+  # Collection of methods to detect if a file type was given.
+  # config.file_methods = [ :mounted_as, :file?, :public_filename ]
+
+  # Custom mappings for input types. This should be a hash containing a regexp
+  # to match as key, and the input type that will be used when the field name
+  # matches the regexp as value.
+  # config.input_mappings = { /count/ => :integer }
+
+  # Custom wrappers for input types. This should be a hash containing an input
+  # type as key and the wrapper that will be used for all inputs with specified type.
+  # config.wrapper_mappings = { string: :prepend }
+
+  # Namespaces where SimpleForm should look for custom input classes that
+  # override default inputs.
+  # config.custom_inputs_namespaces << "CustomInputs"
+
+  # Default priority for time_zone inputs.
+  # config.time_zone_priority = nil
+
+  # Default priority for country inputs.
+  # config.country_priority = nil
+
+  # When false, do not use translations for labels.
+  # config.translate_labels = true
+
+  # Automatically discover new inputs in Rails' autoload path.
+  # config.inputs_discovery = true
+
+  # Cache SimpleForm inputs discovery
+  # config.cache_discovery = !Rails.env.development?
+
+  # Default class for inputs
+  # config.input_class = nil
+
+  # Define the default class of the input wrapper of the boolean input.
+  config.boolean_label_class = 'checkbox'
+
+  # Defines if the default input wrapper class should be included in radio
+  # collection wrappers.
+  # config.include_default_input_wrapper_class = true
+
+  # Defines which i18n scope will be used in Simple Form.
+  # config.i18n_scope = 'simple_form'
+end
diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb
new file mode 100644
index 0000000..109d29a
--- /dev/null
+++ b/config/initializers/simple_form_bootstrap.rb
@@ -0,0 +1,149 @@
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  config.error_notification_class = 'alert alert-danger'
+  config.button_class = 'btn btn-default'
+  config.boolean_label_class = nil
+
+  config.wrappers :vertical_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label, class: 'control-label'
+
+    b.use :input, class: 'form-control'
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :vertical_file_input, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :readonly
+    b.use :label, class: 'control-label'
+
+    b.use :input
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :vertical_boolean, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.wrapper tag: 'div', class: 'checkbox' do |ba|
+      ba.use :label_input
+    end
+
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :vertical_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+    b.use :label, class: 'control-label'
+    b.use :input
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :horizontal_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label, class: 'col-sm-3 control-label'
+
+    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+      ba.use :input, class: 'form-control'
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :horizontal_file_input, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :readonly
+    b.use :label, class: 'col-sm-3 control-label'
+
+    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+      ba.use :input
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :horizontal_boolean, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.wrapper tag: 'div', class: 'col-sm-offset-3 col-sm-9' do |wr|
+      wr.wrapper tag: 'div', class: 'checkbox' do |ba|
+        ba.use :label_input
+      end
+
+      wr.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      wr.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :horizontal_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.use :label, class: 'col-sm-3 control-label'
+
+    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+      ba.use :input
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :inline_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label, class: 'sr-only'
+
+    b.use :input, class: 'form-control'
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :multi_select, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+    b.use :label, class: 'control-label'
+    b.wrapper tag: 'div', class: 'form-inline' do |ba|
+      ba.use :input, class: 'form-control'
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+  # Wrappers for forms and inputs using the Bootstrap toolkit.
+  # Check the Bootstrap docs (http://getbootstrap.com)
+  # to learn about the different styles for forms and inputs,
+  # buttons and other elements.
+  config.default_wrapper = :vertical_form
+  config.wrapper_mappings = {
+    check_boxes: :vertical_radio_and_checkboxes,
+    radio_buttons: :vertical_radio_and_checkboxes,
+    file: :vertical_file_input,
+    boolean: :vertical_boolean,
+    datetime: :multi_select,
+    date: :multi_select,
+    time: :multi_select
+  }
+end
diff --git a/config/routes.rb b/config/routes.rb
index 77d8ee3..8d47127 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,9 @@
 Rails.application.routes.draw do
+  resources :labels
   root to: 'visitors#index'
   devise_for :users
   resources :users
+
+  resources :labels
+  resources :user_labels
 end
diff --git a/db/migrate/20160808041021_create_labels.rb b/db/migrate/20160808041021_create_labels.rb
new file mode 100644
index 0000000..1b7c5f2
--- /dev/null
+++ b/db/migrate/20160808041021_create_labels.rb
@@ -0,0 +1,13 @@
+class CreateLabels < ActiveRecord::Migration
+  def change
+    create_table :labels, force: :cascade do |t|
+      t.string :name, null: false
+      t.string :colour, null: false
+
+      t.timestamps
+    end
+
+    add_index :labels, [:name, :colour], unique: true
+
+  end
+end
diff --git a/db/migrate/20160808041037_create_user_labels.rb b/db/migrate/20160808041037_create_user_labels.rb
new file mode 100644
index 0000000..61812c1
--- /dev/null
+++ b/db/migrate/20160808041037_create_user_labels.rb
@@ -0,0 +1,11 @@
+class CreateUserLabels < ActiveRecord::Migration
+  def change
+    create_table :user_labels do |t|
+      t.integer :user_id, null: false
+      t.integer :label_id, null: false
+
+    end
+
+    add_index :user_labels, [:user_id, :label_id], unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index bda45af..e61656a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,26 +11,42 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150101174918) do
+ActiveRecord::Schema.define(version: 20160808041037) do
+
+  create_table "labels", force: :cascade do |t|
+    t.string   "name",       limit: 255, null: false
+    t.string   "colour",     limit: 255, null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "labels", ["name", "colour"], name: "index_labels_on_name_and_colour", unique: true, using: :btree
+
+  create_table "user_labels", force: :cascade do |t|
+    t.integer "user_id",  limit: 4, null: false
+    t.integer "label_id", limit: 4, null: false
+  end
+
+  add_index "user_labels", ["user_id", "label_id"], name: "index_user_labels_on_user_id_and_label_id", unique: true, using: :btree
 
   create_table "users", force: :cascade do |t|
-    t.string   "email",                  default: "", null: false
-    t.string   "encrypted_password",     default: "", null: false
-    t.string   "reset_password_token"
+    t.string   "email",                  limit: 255, default: "", null: false
+    t.string   "encrypted_password",     limit: 255, default: "", null: false
+    t.string   "reset_password_token",   limit: 255
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,  null: false
+    t.integer  "sign_in_count",          limit: 4,   default: 0,  null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
+    t.string   "current_sign_in_ip",     limit: 255
+    t.string   "last_sign_in_ip",        limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "name"
-    t.integer  "role"
+    t.string   "name",                   limit: 255
+    t.integer  "role",                   limit: 4
   end
 
-  add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+  add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
+  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
 
 end
diff --git a/spec/controllers/labels_controller_spec.rb b/spec/controllers/labels_controller_spec.rb
new file mode 100644
index 0000000..3e25524
--- /dev/null
+++ b/spec/controllers/labels_controller_spec.rb
@@ -0,0 +1,14 @@
+require 'rails_helper'
+
+RSpec.describe LabelsController, type: :controller do
+
+  describe 'POST #create' do
+    context 'with valid attributes' do
+      it 'creates the label' do
+        post :create, label: attributes_for(:label)
+        expect(Label.count).to eq(1)
+      end
+    end
+  end
+
+end
diff --git a/spec/controllers/user_labels_controller_spec.rb b/spec/controllers/user_labels_controller_spec.rb
new file mode 100644
index 0000000..0ba1924
--- /dev/null
+++ b/spec/controllers/user_labels_controller_spec.rb
@@ -0,0 +1,14 @@
+require 'rails_helper'
+
+RSpec.describe UserLabelsController, type: :controller do
+  # Test!
+  context "valid" do
+
+    # it { is_expected.to respond_with 200 }
+  end
+
+  # context "invalid" do
+  # end
+  # post :create, { user_label: user_label } *
+
+end
\ No newline at end of file
diff --git a/spec/factories/labels.rb b/spec/factories/labels.rb
new file mode 100644
index 0000000..62c4580
--- /dev/null
+++ b/spec/factories/labels.rb
@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :label do
+    
+  end
+
+end
diff --git a/spec/features/labels/label_index_spec.rb b/spec/features/labels/label_index_spec.rb
new file mode 100644
index 0000000..fa0b0a6
--- /dev/null
+++ b/spec/features/labels/label_index_spec.rb
@@ -0,0 +1,18 @@
+include Warden::Test::Helpers
+Warden.test_mode!
+
+
+feature 'Labels index page', :devise do
+
+  after(:each) do
+    Warden.test_reset!
+  end
+
+  scenario 'user sees own email address' do
+    user = FactoryGirl.create(:user, :admin)
+    login_as(user, scope: :user)
+    visit users_path
+    expect(page).to have_content user.email
+  end
+
+end
diff --git a/spec/models/label_spec.rb b/spec/models/label_spec.rb
new file mode 100644
index 0000000..43e3e10
--- /dev/null
+++ b/spec/models/label_spec.rb
@@ -0,0 +1,17 @@
+require 'rails_helper'
+
+RSpec.describe Label, type: :model do
+  it { should validate_presence_of(:name) }
+  it { should validate_presence_of(:colour) }
+
+  before do
+    Label.create(name: "label 1", colour: "black")
+  end
+
+  subject { Label.new(name: "label 1", colour: "black") }
+
+  it { should validate_uniqueness_of(:colour).scoped_to(:name).
+      with_message(/- Label already has this colour/) }
+
+
+end
diff --git a/spec/models/user_label_spec.rb b/spec/models/user_label_spec.rb
new file mode 100644
index 0000000..95e517e
--- /dev/null
+++ b/spec/models/user_label_spec.rb
@@ -0,0 +1,21 @@
+require 'rails_helper'
+
+RSpec.describe UserLabel, type: :model do
+
+  before do
+    User.create(email: 'test1@yopmail.com', password: 'password123')
+    Label.create(name: 'label 1', colour: 'green')
+  end
+
+  it { should validate_presence_of(:user_id) }
+  it { should validate_presence_of(:label_id) }
+
+
+
+  subject { UserLabel.new(user_id: User.first.id, label_id: Label.first.id) }
+
+  it { should validate_uniqueness_of(:label_id).scoped_to(:user_id).
+      with_message(/ already has this label./) }
+
+
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 443c602..6581685 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -55,3 +55,20 @@
   # arbitrary gems may also be filtered via:
   # config.filter_gems_from_backtrace("gem name")
 end
+
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    # Choose a test framework:
+    with.test_framework :rspec
+    # with.test_framework :minitest
+    # with.test_framework :minitest_4
+    # with.test_framework :test_unit
+
+    # Choose one or more libraries:
+    # with.library :active_record
+    # with.library :active_model
+    # with.library :action_controller
+    # Or, choose the following (which implies all of the above):
+    with.library :rails
+  end
+end