diff --git a/db/schema.rb b/db/schema.rb
index 3ff9498..c40a0ac 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,10 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161102221313) do
+ActiveRecord::Schema.define(version: 20161208122123) do
+
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
 
   create_table "answers", force: :cascade do |t|
     t.text     "text"
@@ -22,35 +25,13 @@
     t.datetime "updated_at"
   end
 
-  create_table "answers_options", id: false, force: :cascade do |t|
-    t.integer "answer_id", null: false
-    t.integer "option_id", null: false
+  create_table "answers_question_options", id: false, force: :cascade do |t|
+    t.integer "answer_id",          null: false
+    t.integer "question_option_id", null: false
   end
 
-  add_index "answers_options", ["answer_id", "option_id"], name: "index_answers_options_on_answer_id_and_option_id"
-
-  create_table "comments", force: :cascade do |t|
-    t.integer  "user_id"
-    t.integer  "question_id"
-    t.text     "text"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "archived"
-    t.integer  "plan_id"
-    t.integer  "archived_by"
-  end
-
-  create_table "dmptemplates", force: :cascade do |t|
-    t.string   "title"
-    t.text     "description"
-    t.boolean  "published"
-    t.integer  "user_id"
-    t.integer  "organisation_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "locale"
-    t.boolean  "is_default"
-  end
+  add_index "answers_question_options", ["answer_id", "question_option_id"], name: "answer_question_option_index", using: :btree
+  add_index "answers_question_options", ["question_option_id", "answer_id"], name: "question_option_answer_index", using: :btree
 
   create_table "dmptemplates_guidance_groups", id: false, force: :cascade do |t|
     t.integer "dmptemplate_id"
@@ -61,8 +42,8 @@
     t.integer  "plan_id"
     t.integer  "user_id"
     t.string   "format"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "file_types", force: :cascade do |t|
@@ -70,8 +51,8 @@
     t.string   "icon_name"
     t.integer  "icon_size"
     t.string   "icon_location"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
   end
 
   create_table "file_uploads", force: :cascade do |t|
@@ -82,8 +63,8 @@
     t.boolean  "published"
     t.string   "location"
     t.integer  "file_type_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",   null: false
+    t.datetime "updated_at",   null: false
   end
 
   create_table "friendly_id_slugs", force: :cascade do |t|
@@ -93,31 +74,24 @@
     t.datetime "created_at"
   end
 
-  add_index "friendly_id_slugs", ["slug", "sluggable_type"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type", unique: true
-  add_index "friendly_id_slugs", ["sluggable_id"], name: "index_friendly_id_slugs_on_sluggable_id"
-  add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type"
+  add_index "friendly_id_slugs", ["slug", "sluggable_type"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type", unique: true, using: :btree
+  add_index "friendly_id_slugs", ["sluggable_id"], name: "index_friendly_id_slugs_on_sluggable_id", using: :btree
+  add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type", using: :btree
 
   create_table "guidance_groups", force: :cascade do |t|
     t.string   "name"
-    t.integer  "organisation_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.integer  "org_id"
+    t.datetime "created_at",      null: false
+    t.datetime "updated_at",      null: false
     t.boolean  "optional_subset"
     t.boolean  "published"
   end
 
-  create_table "guidance_in_group", id: false, force: :cascade do |t|
-    t.integer "guidance_id",       null: false
-    t.integer "guidance_group_id", null: false
-  end
-
-  add_index "guidance_in_group", ["guidance_id", "guidance_group_id"], name: "index_guidance_in_group_on_guidance_id_and_guidance_group_id"
-
   create_table "guidances", force: :cascade do |t|
     t.text     "text"
     t.integer  "guidance_group_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",        null: false
+    t.datetime "updated_at",        null: false
     t.integer  "question_id"
     t.boolean  "published"
   end
@@ -129,25 +103,18 @@
     t.boolean "default_language"
   end
 
-  create_table "option_warnings", force: :cascade do |t|
-    t.integer  "organisation_id"
-    t.integer  "option_id"
+  create_table "notes", force: :cascade do |t|
+    t.integer  "user_id"
     t.text     "text"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "options", force: :cascade do |t|
-    t.integer  "question_id"
-    t.string   "text"
-    t.integer  "number"
-    t.boolean  "is_default"
+    t.boolean  "archived"
+    t.integer  "answer_id"
+    t.integer  "archived_by"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "org_token_permissions", force: :cascade do |t|
-    t.integer  "organisation_id"
+    t.integer  "org_id"
     t.integer  "token_permission_type_id"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -156,24 +123,23 @@
   create_table "organisation_types", force: :cascade do |t|
     t.string   "name"
     t.text     "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
   end
 
-  create_table "organisations", force: :cascade do |t|
+  create_table "orgs", force: :cascade do |t|
     t.string   "name"
     t.string   "abbreviation"
     t.string   "target_url"
     t.integer  "organisation_type_id"
-    t.string   "domain"
     t.string   "wayfless_entity"
-    t.integer  "stylesheet_file_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",           null: false
+    t.datetime "updated_at",           null: false
     t.integer  "parent_id"
     t.boolean  "is_other"
     t.string   "sort_name"
     t.text     "banner_text"
+    t.string   "logo_file_name"
     t.integer  "region_id"
     t.integer  "language_id"
     t.string   "logo_uid"
@@ -181,60 +147,41 @@
     t.string   "contact_email"
   end
 
+  create_table "perms", force: :cascade do |t|
+    t.string   "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "perms", ["name"], name: "index_perms_on_name", using: :btree
+  add_index "perms", ["name"], name: "index_roles_on_name_and_resource_type_and_resource_id", using: :btree
+
   create_table "phases", force: :cascade do |t|
     t.string   "title"
     t.text     "description"
     t.integer  "number"
-    t.integer  "dmptemplate_id"
+    t.integer  "template_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "slug"
+    t.boolean  "modifiable"
   end
 
-  add_index "phases", ["dmptemplate_id"], name: "index_phases_on_dmptemplate_id"
-  add_index "phases", ["slug"], name: "index_phases_on_slug", unique: true
-
   create_table "plan_sections", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "section_id"
     t.integer  "plan_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",   null: false
+    t.datetime "updated_at",   null: false
     t.datetime "release_time"
   end
 
   create_table "plans", force: :cascade do |t|
-    t.boolean  "locked"
-    t.integer  "project_id"
-    t.integer  "version_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "project_groups", force: :cascade do |t|
-    t.boolean  "project_creator"
-    t.boolean  "project_editor"
-    t.integer  "user_id"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "project_administrator"
-  end
-
-  create_table "project_guidance", id: false, force: :cascade do |t|
-    t.integer "project_id",        null: false
-    t.integer "guidance_group_id", null: false
-  end
-
-  add_index "project_guidance", ["project_id", "guidance_group_id"], name: "index_project_guidance_on_project_id_and_guidance_group_id"
-
-  create_table "projects", force: :cascade do |t|
     t.string   "title"
-    t.integer  "dmptemplate_id"
+    t.integer  "template_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "slug"
-    t.integer  "organisation_id"
     t.string   "grant_number"
     t.string   "identifier"
     t.text     "description"
@@ -244,11 +191,53 @@
     t.string   "funder_name"
   end
 
-  add_index "projects", ["slug"], name: "index_projects_on_slug", unique: true
+  create_table "project_groups", force: :cascade do |t|
+    t.boolean  "project_creator"
+    t.boolean  "project_editor"
+    t.integer  "user_id"
+    t.integer  "project_id"
+    t.datetime "created_at",            null: false
+    t.datetime "updated_at",            null: false
+    t.boolean  "project_administrator"
+  end
+
+  create_table "project_guidance", id: false, force: :cascade do |t|
+    t.integer "project_id",        null: false
+    t.integer "guidance_group_id", null: false
+  end
+
+  add_index "project_guidance", ["project_id", "guidance_group_id"], name: "index_project_guidance_on_project_id_and_guidance_group_id", using: :btree
+
+  create_table "projects", force: :cascade do |t|
+    t.string   "title"
+    t.integer  "dmptemplate_id"
+    t.datetime "created_at",                        null: false
+    t.datetime "updated_at",                        null: false
+    t.string   "slug"
+    t.integer  "org_id"
+    t.string   "grant_number"
+    t.string   "identifier"
+    t.text     "description"
+    t.string   "principal_investigator"
+    t.string   "principal_investigator_identifier"
+    t.string   "data_contact"
+    t.string   "funder_name"
+  end
+
+  add_index "projects", ["slug"], name: "index_projects_on_slug", unique: true, using: :btree
 
   create_table "question_formats", force: :cascade do |t|
     t.string   "title"
     t.text     "description"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
+  end
+
+  create_table "question_options", force: :cascade do |t|
+    t.integer  "question_id"
+    t.string   "text"
+    t.integer  "number"
+    t.boolean  "is_default"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -258,14 +247,12 @@
     t.text     "default_value"
     t.text     "guidance"
     t.integer  "number"
-    t.integer  "parent_id"
-    t.integer  "dependency_id"
-    t.text     "dependency_text"
     t.integer  "section_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "question_format_id"
     t.boolean  "option_comment_display", default: true
+    t.boolean  "modifiable"
   end
 
   create_table "questions_themes", id: false, force: :cascade do |t|
@@ -273,7 +260,8 @@
     t.integer "theme_id",    null: false
   end
 
-  add_index "questions_themes", ["question_id", "theme_id"], name: "index_questions_themes_on_question_id_and_theme_id"
+  add_index "questions_themes", ["question_id", "theme_id"], name: "question_theme_index", using: :btree
+  add_index "questions_themes", ["theme_id", "question_id"], name: "theme_question_index", using: :btree
 
   create_table "region_groups", force: :cascade do |t|
     t.integer "super_region_id"
@@ -287,26 +275,24 @@
   end
 
   create_table "roles", force: :cascade do |t|
-    t.string   "name"
+    t.boolean  "creator"
+    t.boolean  "editor"
+    t.boolean  "administrator"
+    t.integer  "user_id"
+    t.integer  "plan_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "role_in_plans"
-    t.integer  "resource_id"
-    t.string   "resource_type"
   end
 
-  add_index "roles", ["name"], name: "index_roles_on_name"
-  add_index "roles", ["name"], name: "index_roles_on_name_and_resource_type_and_resource_id"
-
   create_table "sections", force: :cascade do |t|
     t.string   "title"
     t.text     "description"
     t.integer  "number"
-    t.integer  "version_id"
-    t.integer  "organisation_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.boolean  "published"
+    t.integer  "phase_id"
+    t.boolean  "modifiable"
   end
 
   create_table "settings", force: :cascade do |t|
@@ -314,32 +300,47 @@
     t.text     "value"
     t.integer  "target_id",   null: false
     t.string   "target_type", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
   end
 
-  add_index "settings", ["target_type", "target_id", "var"], name: "index_settings_on_target_type_and_target_id_and_var", unique: true
+  add_index "settings", ["target_type", "target_id", "var"], name: "index_settings_on_target_type_and_target_id_and_var", unique: true, using: :btree
 
   create_table "splash_logs", force: :cascade do |t|
     t.string   "destination"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
   end
 
   create_table "suggested_answers", force: :cascade do |t|
     t.integer  "question_id"
-    t.integer  "organisation_id"
+    t.integer  "org_id"
     t.text     "text"
+    t.boolean  "is_example"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "is_example"
+  end
+
+  create_table "templates", force: :cascade do |t|
+    t.string   "title"
+    t.text     "description"
+    t.boolean  "published"
+    t.integer  "org_id"
+    t.string   "locale"
+    t.boolean  "is_default"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "version"
+    t.integer  "visibility"
+    t.integer  "customization_of"
+    t.integer  "dmptemplate_id"
   end
 
   create_table "themes", force: :cascade do |t|
     t.string   "title"
     t.text     "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
     t.string   "locale"
   end
 
@@ -355,28 +356,12 @@
     t.datetime "updated_at"
   end
 
-  create_table "user_statuses", force: :cascade do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "user_types", force: :cascade do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "users", force: :cascade do |t|
     t.string   "firstname"
     t.string   "surname"
     t.string   "email",                  default: "", null: false
     t.string   "orcid_id"
     t.string   "shibboleth_id"
-    t.integer  "user_type_id"
-    t.integer  "user_status_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "encrypted_password",     default: ""
@@ -398,24 +383,24 @@
     t.string   "other_organisation"
     t.boolean  "dmponline3"
     t.boolean  "accept_terms"
-    t.integer  "organisation_id"
+    t.integer  "org_id"
     t.string   "api_token"
     t.integer  "invited_by_id"
     t.string   "invited_by_type"
     t.integer  "language_id"
   end
 
-  add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
-  add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["invitation_token"], name: "index_users_on_invitation_token", unique: true
-  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+  add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree
+  add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
+  add_index "users", ["invitation_token"], name: "index_users_on_invitation_token", unique: true, using: :btree
+  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
 
-  create_table "users_roles", id: false, force: :cascade do |t|
+  create_table "users_perms", id: false, force: :cascade do |t|
     t.integer "user_id"
-    t.integer "role_id"
+    t.integer "perm_id"
   end
 
-  add_index "users_roles", ["user_id", "role_id"], name: "index_users_roles_on_user_id_and_role_id"
+  add_index "users_perms", ["user_id", "perm_id"], name: "index_users_perms_on_user_id_and_perm_id", using: :btree
 
   create_table "versions", force: :cascade do |t|
     t.string   "title"
@@ -423,10 +408,42 @@
     t.boolean  "published"
     t.integer  "number"
     t.integer  "phase_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
   end
 
-  add_index "versions", ["phase_id"], name: "index_versions_on_phase_id"
+  add_index "versions", ["phase_id"], name: "index_versions_on_phase_id", using: :btree
 
+  add_foreign_key "answers", "plans"
+  add_foreign_key "answers", "questions"
+  add_foreign_key "answers", "users"
+  add_foreign_key "answers_question_options", "answers"
+  add_foreign_key "answers_question_options", "question_options"
+  add_foreign_key "guidance_groups", "orgs"
+  add_foreign_key "guidances", "guidance_groups"
+  add_foreign_key "notes", "answers"
+  add_foreign_key "notes", "users"
+  add_foreign_key "org_token_permissions", "orgs"
+  add_foreign_key "org_token_permissions", "token_permission_types"
+  add_foreign_key "orgs", "languages"
+  add_foreign_key "orgs", "regions"
+  add_foreign_key "phases", "templates"
+  add_foreign_key "plans", "templates"
+  add_foreign_key "question_options", "questions"
+  add_foreign_key "questions", "question_formats"
+  add_foreign_key "questions", "sections"
+  add_foreign_key "questions_themes", "questions"
+  add_foreign_key "questions_themes", "themes"
+  add_foreign_key "roles", "plans"
+  add_foreign_key "roles", "users"
+  add_foreign_key "sections", "phases"
+  add_foreign_key "suggested_answers", "orgs"
+  add_foreign_key "suggested_answers", "questions"
+  add_foreign_key "templates", "orgs"
+  add_foreign_key "themes_in_guidance", "guidances"
+  add_foreign_key "themes_in_guidance", "themes"
+  add_foreign_key "users", "languages"
+  add_foreign_key "users", "orgs"
+  add_foreign_key "users_perms", "perms"
+  add_foreign_key "users_perms", "users"
 end