diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 00000000..71292b45
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,67 @@
+# Ruby CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-ruby/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+       - image: circleci/ruby:2.4.1-node-browsers
+         environment:
+           - PGHOST=localhost
+           - PGUSER=ubuntu
+           - RAILS_ENV=test
+           - RACK_ENV=test
+           - DATABASE_URL: postgres://ubuntu@localhost:5432/points_test
+       - image: circleci/postgres:9.6.2
+         environment:
+           - POSTGRES_USER=ubuntu
+           - POSTGRES_DB=points_test
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+      # - image: circleci/postgres:9.4
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "Gemfile.lock" }}
+          # fallback to using the latest cache if no exact match is found
+          - v1-dependencies-
+
+      - run:
+          name: install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
+
+      # Database setup
+      - run: bundle exec rake db:create
+      - run: bundle exec rake db:schema:load
+
+      # run tests!
+      - run:
+          name: run tests
+          command: |
+            mkdir /tmp/test-results
+            TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)"
+
+            bundle exec rspec --format progress \
+                              $TEST_FILES
+
+      # collect reports
+      - store_test_results:
+          path: /tmp/test-results
+      - store_artifacts:
+          path: /tmp/test-results
+          destination: test-results
diff --git a/.env.sample b/.env.sample
index 27ea88f1..acf9b56a 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,5 +1,2 @@
-ORGANIZATION_LOGIN=<INSERT-HERE>
 GITHUB_APP_ID=<INSERT-HERE>
 GITHUB_APP_SECRET=<INSERT-HERE>
-NEW_RELIC_LICENSE_KEY=<INSERT-HERE>
-SENTRY_DSN=<INSERT-HERE>
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 16cb40a9..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ""
-labels: "Bug"
-assignees: ""
-
----
-
-**IMPORTANT: please make sure you ask yourself all intro questions and fill all sections of the template.**
-
-**Before we start...:**
-
-- [ ] I checked the documentation and found no answer
-- [ ] I checked to make sure that this issue has not already been filed
-- [ ] I'm reporting the issue to the correct repository (for multi-repository projects)
-
-
-**Branch/Commit:**
-
-Inform what branch/commit of Points you are using.
-
-**Expected behavior:**
-
-Please include a detailed description of the behavior you were expecting when you encountered this issue.
-
-**Actual behavior:**
-
-Please include a detailed description of the actual behavior of the application.
-
-**Steps to reproduce:**
-
-How do I achieve this behavior? Use the following format to provide a step-by-step guide:
-
-1. Step 1: ...
-2. Step 2: ...
-
-**Context and environment:**
-
-Provide any relevant information about your setup (Customize the list accordingly based on what info is relevant to this project)
-
-1. Version of the software the issue is being opened for.
-2. Operating System
-3. Operating System version
-4. Browser
-5. Browser version
-6. Device
-
-_Delete any information that is not relevant._
-
-If you are unable to reproduce the bug, add the **Non-Reproducible** tag and describe the steps you followed leading to the bug to the best of your recollection.
-
-**Screenshots and Videos**
-
-If the issue has an effect in the frontend, include any relevant screenshots and videos here.
-
-**Logs**
-
-Include relevant log snippets or files here.
-
-**I will abide by the [code of conduct](https://github.com/fastruby/points/blob/main/CODE_OF_CONDUCT.md)**
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 367d9a6b..00000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,47 +0,0 @@
----
-name: Feature request
-about: Request a new feature
-title: ""
-labels: "Feature Request"
-assignees: ""
-
----
-
-**IMPORTANT: please make sure you ask yourself all intro questions and fill all sections of the template.**
-
-**Before we start...:**
-
-- [ ] I checked the documentation and didn't find this feature
-- [ ] I checked to make sure that this feature has not already been requested
-
-
-**Branch/Commit:**
-
-Inform what branch/commit/version of "Points" you are using.
-
-**Describe the feature:**
-
-Please include a detailed description of the feature you are requesting and any detail on it’s expected behavior.
-
-> **As a \<role name\>**
-> **I do \<something\>**
-> **And then I do \<another action\>**
-> **And I see \<some result\>**
-
-**Problem:**
-
-Please include a detailed description of the problem this feature would solve.
-
-> **As a \<role name\>**
-> **I want to \<do something\>**
-> **So that I can achieve a \<goal\>**
-
-**Mockups:**
-
-Include any mockup idea related to the requested feature if it applies.
-
-**Resources:**
-
-If you have resources related to the implementation or research for this feature, add them here.
-
-**I will abide by the [code of conduct](https://github.com/fastruby/points/blob/main/CODE_OF_CONDUCT.md)**
diff --git a/.github/workflows/review-app-close.yml b/.github/workflows/review-app-close.yml
deleted file mode 100644
index 864a7047..00000000
--- a/.github/workflows/review-app-close.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Destroy Review App on Close
-on:
-  pull_request:
-    types: [closed]
-
-jobs:
-  destroy-review-app:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: fastruby/manage-heroku-review-app@v1
-        with:
-          action: destroy
-        env:
-          HEROKU_API_TOKEN: ${{ secrets.HEROKU_API_TOKEN }}
-          HEROKU_PIPELINE_ID: ${{ secrets.HEROKU_PIPELINE_ID }}
\ No newline at end of file
diff --git a/.github/workflows/review-app-label.yml b/.github/workflows/review-app-label.yml
deleted file mode 100644
index 29b92d2b..00000000
--- a/.github/workflows/review-app-label.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Heroku Review App on label
-on:
-  pull_request:
-    types: [labeled]
-
-jobs:
-  create-review-app:
-    if: ${{ github.event.label.name == 'create-review-app' }}
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: fastruby/create-heroku-review-app@main
-        with:
-          action: create
-        env:
-          HEROKU_API_TOKEN: ${{ secrets.HEROKU_API_TOKEN }}
-          HEROKU_PIPELINE_ID: ${{ secrets.HEROKU_PIPELINE_ID }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: fastruby/pr-unlabeler@v1
-        with:
-          label-to-remove: "create-review-app"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  destroy-review-app:
-    if: ${{ github.event.label.name == 'destroy-review-app' }}
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: fastruby/create-heroku-review-app@main
-        with:
-          action: destroy
-        env:
-          HEROKU_API_TOKEN: ${{ secrets.HEROKU_API_TOKEN }}
-          HEROKU_PIPELINE_ID: ${{ secrets.HEROKU_PIPELINE_ID }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: fastruby/pr-unlabeler@v1
-        with:
-          label-to-remove: "destroy-review-app"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/tests-next.yml b/.github/workflows/tests-next.yml
deleted file mode 100644
index 9c400317..00000000
--- a/.github/workflows/tests-next.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: Points with next Rails
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  build-rails-next:
-    runs-on: ubuntu-latest
-
-    env:
-      DATABASE_URL: "postgres://postgres:postgres@localhost/points-test"
-      BUNDLE_GEMFILE: Gemfile.next
-
-    services:
-      postgres:
-        image: postgres:11.6-alpine
-        ports:
-          - 5432:5432
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v1
-
-      - name: Install PostgreSQL 11 client
-        run: |
-          sudo apt-get -yqq install libpq-dev
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: "3.2.3"
-
-      - name: Build App
-        run: |
-          bundle update rails --jobs=4 --retry=3
-          bundle exec rails db:setup
-      - name: Run RSpec
-        run: |
-          bundle exec rspec
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
deleted file mode 100644
index 4aa80abb..00000000
--- a/.github/workflows/tests.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-name: Points
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  build-rails-current:
-    runs-on: ubuntu-latest
-
-    env:
-      DATABASE_URL: "postgres://postgres:postgres@localhost/points-test"
-
-    services:
-      postgres:
-        image: postgres:11.6-alpine
-        ports:
-          - 5432:5432
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-        # needed because the postgres container does not provide a healthcheck
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v1
-
-      - name: Install PostgreSQL 11 client
-        run: |
-          sudo apt-get -yqq install libpq-dev
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: "3.2.3"
-          bundler-cache: true
-
-      - name: Build App
-        run: |
-          bundle exec rails db:setup
-      - name: Run RSpec
-        run: |
-          bundle exec rspec
-      - uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: Screenshots and logs
-          path: |
-            tmp/capybara
-            log
diff --git a/.gitignore b/.gitignore
index 7be1a779..9c00f596 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,15 +3,5 @@ tmp
 log/*.log
 config/database.yml
 .ruby-version
-.tool-versions
 coverage
 .env
-.byebug_history
-.tool-versions
-.DS_Store
-public/assets
-
-node_modules
-yarn-error.log
-yarn-debug.log*
-.yarn-integrity
diff --git a/.pre-commit b/.pre-commit
deleted file mode 100644
index de9fef65..00000000
--- a/.pre-commit
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-bundle exec rubocop
diff --git a/.rubocop.yml b/.rubocop.yml
deleted file mode 100644
index 518470c7..00000000
--- a/.rubocop.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-require:
-  - standard
-
-inherit_gem:
-  standard: config/base.yml # use the standardrb config file as the base
-
-AllCops:
-  SuggestExtensions: false
-  NewCops: enable
-  Exclude: # ignore files in these directories when running the linter
-    - bin/**/*
-    - node_modules/**/*
-    - public/**/*
-    - vendor/**/*
-    - db/schema.rb
-
-Bundler/DuplicatedGem:
-  Enabled: false # ignore duplicated gem error
diff --git a/.ruby-version.sample b/.ruby-version.sample
new file mode 100644
index 00000000..005119ba
--- /dev/null
+++ b/.ruby-version.sample
@@ -0,0 +1 @@
+2.4.1
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index d662fd59..00000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at oss@ombulabs.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 7382f0b3..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM circleci/ruby:3.0.2-node-browsers
-
-ARG BUNDLE_GEMFILE=Gemfile
-
-WORKDIR /code
-
-# Uncomment this line if docker return any permission errors when trying to
-# run commands for building or running the image.
-# USER root
-
-COPY Gemfile* ./
-
-RUN gem install bundler:"$(tail -n 1 Gemfile.lock)"
-RUN BUNDLE_GEMFILE=${BUNDLE_GEMFILE} bundle "_$(tail -n 1 Gemfile.lock)_" install
-
-EXPOSE 3000
-
diff --git a/Gemfile b/Gemfile
old mode 100644
new mode 100755
index c790a535..0064afd7
--- a/Gemfile
+++ b/Gemfile
@@ -1,46 +1,41 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 def next?
   File.basename(__FILE__) == "Gemfile.next"
 end
 
-ruby "3.2.3"
-
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
   "https://github.com/#{repo_name}.git"
 end
 
+
 if next?
-  # using the 7-0-stable branch for the time being until the fix is merged into main
-  # to make it work with ruby 3.1
-  # read more about it here: https://github.com/rails/rails/issues/43998,
-  # and here: https://gist.github.com/claudiug/bdc2fb70b10d19513208c816588aed92
-  gem "rails", "~> 7.2.0"
+  gem 'rails', '~> 5.2.3'
 else
-  gem "rails", "~> 7.1.0"
+  gem 'rails', '~> 5.1.4'
 end
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 
-gem "bootstrap-sass", "3.4.1"
-
+gem 'bootstrap-sass', '3.3.7'
+gem 'devise'
 # Use sqlite3 as the database for Active Record
-# gem 'sqlite3'
+#gem 'sqlite3'
 # Use Puma as the app server
-gem "puma", "~> 6.5"
+gem 'puma', '~> 3.7'
 # Use SCSS for stylesheets
-gem "sass-rails", "~> 5.0"
-
-gem "bourbon"
-gem "matrix"
-
+gem 'sass-rails', '~> 5.0'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
 # See https://github.com/rails/execjs#readme for more supported runtimes
 # gem 'therubyracer', platforms: :ruby
-gem "redcarpet", "~> 3.5.1"
+gem 'redcarpet', '~> 3.0.0'
+# Use CoffeeScript for .coffee assets and views
+gem 'coffee-rails', '~> 4.2'
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
-gem "turbolinks", "~> 5"
+gem 'turbolinks', '~> 5'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem "jbuilder", "~> 2.5"
+gem 'jbuilder', '~> 2.5'
 # Use Redis adapter to run Action Cable in production
 # gem 'redis', '~> 3.0'
 # Use ActiveModel has_secure_password
@@ -48,64 +43,46 @@ gem "jbuilder", "~> 2.5"
 
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
-gem "jquery-rails"
-
-gem "pg"
-
-gem "jquery-ui-rails", "~> 6.0"
-gem "acts_as_list"
-
-gem "mimemagic", "~> 0.3.8"
-
-gem "ombu_labs-auth"
-
-gem "rack-mini-profiler"
-
-group :production do
-  gem "newrelic_rpm"
-  gem "terser"
-  gem "stackprof"
-  gem "sentry-ruby"
-  gem "sentry-rails"
-end
+gem 'jquery-rails'
+gem 'pg', '~> 0.18'
+gem 'jquery-ui-rails', '~> 5.0', '>= 5.0.5'
+gem 'acts_as_list'
+gem 'omniauth-github'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem "byebug", platforms: [:mri, :mingw, :x64_mingw]
+  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
   # Adds support for Capybara system testing and selenium driver
-  gem "rspec-rails", "~> 6.0.3"
-  gem "faker"
-  gem "shoulda-matchers", "~> 3.1"
-  gem "rails-controller-testing"
-  gem "dotenv-rails"
-  gem "recursive-open-struct"
-  gem "factory_bot_rails"
-  gem "next_rails"
+  gem 'rspec-rails', '~> 3.7'
+  gem 'faker'
+  gem 'shoulda-matchers', '~> 3.1'
+  gem 'rails-controller-testing'
+  gem 'dotenv-rails'
+  gem 'recursive-open-struct'
+  gem 'factory_bot_rails'
 end
 
 group :test do
-  gem "apparition", git: "https://github.com/twalpole/apparition.git", ref: "7db58cc6b0e4ca4141b074ff27d5936a1b8874bf"
-  gem "capybara"
-  gem "webdrivers"
-  gem "database_cleaner-active_record", ">= 2.1.0"
-  gem "capybara-screenshot"
-  gem "simplecov", require: false
+  gem 'apparition', git: "https://github.com/twalpole/apparition.git", ref: "7db58cc6b0e4ca4141b074ff27d5936a1b8874bf"
+  gem 'capybara'
+  gem 'selenium-webdriver'
+  gem 'database_cleaner'
+  gem 'capybara-screenshot'
+  gem 'simplecov', require: false
 end
 
 group :development do
   # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
-  gem "web-console", ">= 3.3.0"
-  gem "listen", "~> 3.7"
+  gem 'web-console', '>= 3.3.0'
+  gem 'listen', '>= 3.0.5', '< 3.2'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
-  gem "spring", "3.0.0"
-  gem "standardrb", require: false
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
 end
 
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-
-gem "coffee-script"
-
-gem "pundit", "~> 2.2"
+group :development, :test do
+  gem 'ten_years_rails'
+end
 
-gem "madmin", "~> 1.2"
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
diff --git a/Gemfile.lock b/Gemfile.lock
index 3f4300d9..022069e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,521 +10,335 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    actioncable (5.1.7)
+      actionpack (= 5.1.7)
       nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-      zeitwerk (~> 2.6)
-    actionmailbox (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activejob (= 7.1.5.1)
-      activerecord (= 7.1.5.1)
-      activestorage (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      actionview (= 7.1.5.1)
-      activejob (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
       mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
-      rails-dom-testing (~> 2.2)
-    actionpack (7.1.5.1)
-      actionview (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
-      nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4)
-      rack-session (>= 1.0.1)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.7)
+      actionview (= 5.1.7)
+      activesupport (= 5.1.7)
+      rack (~> 2.0)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activerecord (= 7.1.5.1)
-      activestorage (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
-      globalid (>= 0.6.0)
-      nokogiri (>= 1.8.5)
-    actionview (7.1.5.1)
-      activesupport (= 7.1.5.1)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.7)
+      activesupport (= 5.1.7)
       builder (~> 3.1)
-      erubi (~> 1.11)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    activejob (7.1.5.1)
-      activesupport (= 7.1.5.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.7)
+      activesupport (= 5.1.7)
       globalid (>= 0.3.6)
-    activemodel (7.1.5.1)
-      activesupport (= 7.1.5.1)
-    activerecord (7.1.5.1)
-      activemodel (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
-      timeout (>= 0.4.0)
-    activestorage (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activejob (= 7.1.5.1)
-      activerecord (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
-      marcel (~> 1.0)
-    activesupport (7.1.5.1)
-      base64
-      benchmark (>= 0.3)
-      bigdecimal
+    activemodel (5.1.7)
+      activesupport (= 5.1.7)
+    activerecord (5.1.7)
+      activemodel (= 5.1.7)
+      activesupport (= 5.1.7)
+      arel (~> 8.0)
+    activesupport (5.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
-      minitest (>= 5.1)
-      mutex_m
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0)
-    acts_as_list (1.1.0)
-      activerecord (>= 4.2)
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
-    ast (2.4.2)
-    autoprefixer-rails (10.4.15.0)
-      execjs (~> 2)
-    base64 (0.1.2)
-    bcrypt (3.1.20)
-    benchmark (0.4.1)
-    bigdecimal (3.2.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    acts_as_list (0.9.19)
+      activerecord (>= 3.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    arel (8.0.0)
+    autoprefixer-rails (9.6.1.1)
+      execjs
+    bcrypt (3.1.13)
     bindex (0.8.1)
-    bootstrap-sass (3.4.1)
+    bootstrap-sass (3.3.7)
       autoprefixer-rails (>= 5.2.1)
-      sassc (>= 2.0.0)
-    bourbon (7.3.0)
-      thor (~> 1.0)
-    builder (3.3.0)
-    byebug (11.1.3)
-    capybara (3.39.2)
+      sass (>= 3.3.4)
+    builder (3.2.3)
+    byebug (11.0.1)
+    capybara (3.29.0)
       addressable
-      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (>= 1.5, < 3.0)
+      regexp_parser (~> 1.5)
       xpath (~> 3.2)
-    capybara-screenshot (1.0.26)
+    capybara-screenshot (1.0.23)
       capybara (>= 1.0, < 4)
       launchy
+    childprocess (2.0.0)
+      rake (< 13.0)
+    coffee-rails (4.2.2)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    colorize (1.1.0)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
-    crass (1.0.6)
-    database_cleaner-active_record (2.1.0)
-      activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
-    database_cleaner-core (2.0.1)
-    date (3.4.1)
-    devise (4.9.4)
+    colorize (0.8.1)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
+    devise (4.7.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    dotenv (2.8.1)
-    dotenv-rails (2.8.1)
-      dotenv (= 2.8.1)
-      railties (>= 3.2)
-    drb (2.2.3)
-    erb (5.0.1)
-    erubi (1.13.1)
-    execjs (2.9.1)
-    factory_bot (6.2.1)
-      activesupport (>= 5.0.0)
-    factory_bot_rails (6.2.0)
-      factory_bot (~> 6.2.0)
-      railties (>= 5.0.0)
-    faker (3.2.1)
-      i18n (>= 1.8.11, < 2)
-    faraday (2.13.1)
-      faraday-net_http (>= 2.0, < 3.5)
-      json
-      logger
-    faraday-net_http (3.4.0)
-      net-http (>= 0.5.0)
-    ffi (1.16.3)
-    globalid (1.2.1)
-      activesupport (>= 6.1)
-    hashie (5.0.0)
-    i18n (1.14.7)
+    diff-lcs (1.3)
+    docile (1.3.2)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.7.5)
+    dotenv-rails (2.7.5)
+      dotenv (= 2.7.5)
+      railties (>= 3.2, < 6.1)
+    erubi (1.8.0)
+    execjs (2.7.0)
+    factory_bot (5.0.2)
+      activesupport (>= 4.2.0)
+    factory_bot_rails (5.0.2)
+      factory_bot (~> 5.0.2)
+      railties (>= 4.2.0)
+    faker (2.2.2)
+      i18n (~> 1.6.0)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.11.1)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    hashie (3.6.0)
+    http-accept (1.7.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    io-console (0.8.0)
-    irb (1.15.2)
-      pp (>= 0.6.0)
-      rdoc (>= 4.0.0)
-      reline (>= 0.4.2)
-    jbuilder (2.11.5)
-      actionview (>= 5.0.0)
-      activesupport (>= 5.0.0)
-    jquery-rails (4.6.0)
+    jbuilder (2.9.1)
+      activesupport (>= 4.2.0)
+    jquery-rails (4.3.5)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (6.0.1)
+    jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
-    json (2.6.3)
-    jwt (2.10.1)
-      base64
-    language_server-protocol (3.17.0.3)
-    launchy (2.5.2)
-      addressable (~> 2.8)
-    lint_roller (1.1.0)
-    listen (3.8.0)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.7.0)
-    loofah (2.24.1)
+    json (2.2.0)
+    jwt (2.2.1)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    loofah (2.2.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    madmin (1.2.8)
-      pagy (>= 3.5)
-      rails (>= 6.0.3)
-    mail (2.8.1)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.0.4)
-    matrix (0.4.2)
-    mimemagic (0.3.10)
-      nokogiri (~> 1)
-      rake
-    mini_mime (1.1.5)
-    minitest (5.25.5)
-    multi_xml (0.7.2)
-      bigdecimal (~> 3.1)
-    mutex_m (0.3.0)
-    net-http (0.6.0)
-      uri
-    net-imap (0.5.8)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.2)
-      timeout
-    net-smtp (0.5.1)
-      net-protocol
-    newrelic_rpm (9.5.0)
-    next_rails (1.3.0)
-      colorize (>= 0.8.1)
-    nio4r (2.7.4)
-    nokogiri (1.18.8-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
-      racc (~> 1.4)
-    oauth2 (2.0.12)
-      faraday (>= 0.17.3, < 4.0)
-      jwt (>= 1.0, < 4.0)
-      logger (~> 1.2)
+    method_source (0.9.2)
+    mime-types (3.3)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0904)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    netrc (0.11.0)
+    nio4r (2.5.1)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 4)
-      snaky_hash (~> 2.0, >= 2.0.3)
-      version_gem (>= 1.1.8, < 3)
-    ombu_labs-auth (1.1.0)
-      devise (~> 4.9)
-      omniauth (~> 2.1.0)
-      omniauth-github (~> 2.0.0)
-      omniauth-rails_csrf_protection
-      rails (>= 6.0, < 8.1)
-    omniauth (2.1.3)
-      hashie (>= 3.4.6)
-      rack (>= 2.2.3)
-      rack-protection
-    omniauth-github (2.0.1)
-      omniauth (~> 2.0)
-      omniauth-oauth2 (~> 1.8)
-    omniauth-oauth2 (1.8.0)
-      oauth2 (>= 1.4, < 3)
-      omniauth (~> 2.0)
-    omniauth-rails_csrf_protection (1.0.2)
-      actionpack (>= 4.2)
-      omniauth (~> 2.0)
+      rack (>= 1.2, < 3)
+    omniauth (1.9.0)
+      hashie (>= 3.4.6, < 3.7.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-github (1.3.0)
+      omniauth (~> 1.5)
+      omniauth-oauth2 (>= 1.4.0, < 2.0)
+    omniauth-oauth2 (1.6.0)
+      oauth2 (~> 1.1)
+      omniauth (~> 1.9)
     orm_adapter (0.5.0)
-    pagy (6.1.0)
-    parallel (1.23.0)
-    parser (3.2.2.4)
-      ast (~> 2.4.1)
-      racc
-    pg (1.5.4)
-    pp (0.6.2)
-      prettyprint
-    prettyprint (0.2.0)
-    psych (5.2.6)
-      date
-      stringio
-    public_suffix (5.0.3)
-    puma (6.6.0)
-      nio4r (~> 2.0)
-    pundit (2.3.1)
-      activesupport (>= 3.0.0)
-    racc (1.8.1)
-    rack (2.2.17)
-    rack-mini-profiler (3.1.1)
-      rack (>= 1.2.0)
-    rack-protection (3.2.0)
-      base64 (>= 0.1.0)
-      rack (~> 2.2, >= 2.2.4)
-    rack-session (1.0.2)
-      rack (< 3)
-    rack-test (2.2.0)
-      rack (>= 1.3)
-    rackup (1.0.1)
-      rack (< 3)
-      webrick
-    rails (7.1.5.1)
-      actioncable (= 7.1.5.1)
-      actionmailbox (= 7.1.5.1)
-      actionmailer (= 7.1.5.1)
-      actionpack (= 7.1.5.1)
-      actiontext (= 7.1.5.1)
-      actionview (= 7.1.5.1)
-      activejob (= 7.1.5.1)
-      activemodel (= 7.1.5.1)
-      activerecord (= 7.1.5.1)
-      activestorage (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
-      bundler (>= 1.15.0)
-      railties (= 7.1.5.1)
-    rails-controller-testing (1.0.5)
-      actionpack (>= 5.0.1.rc1)
-      actionview (>= 5.0.1.rc1)
-      activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.3.0)
-      activesupport (>= 5.0.0)
-      minitest
+    pg (0.21.0)
+    public_suffix (4.0.1)
+    puma (3.12.1)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.1.7)
+      actioncable (= 5.1.7)
+      actionmailer (= 5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
+      activemodel (= 5.1.7)
+      activerecord (= 5.1.7)
+      activesupport (= 5.1.7)
+      bundler (>= 1.3.0)
+      railties (= 5.1.7)
+      sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.4)
+      actionpack (>= 5.0.1.x)
+      actionview (>= 5.0.1.x)
+      activesupport (>= 5.0.1.x)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
-      irb
-      rackup (>= 1.0.0)
-      rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
-      zeitwerk (~> 2.6)
-    rainbow (3.1.1)
-    rake (13.3.0)
-    rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rails-html-sanitizer (1.2.0)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.1.7)
+      actionpack (= 5.1.7)
+      activesupport (= 5.1.7)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.3.3)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
       ffi (~> 1.0)
-    rdoc (6.14.0)
-      erb
-      psych (>= 4.0.0)
-    recursive-open-struct (1.1.3)
-    redcarpet (3.5.1)
-    regexp_parser (2.8.1)
-    reline (0.6.1)
-      io-console (~> 0.5)
-    responders (3.1.1)
-      actionpack (>= 5.2)
-      railties (>= 5.2)
-    rexml (3.2.6)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    recursive-open-struct (1.1.0)
+    redcarpet (3.0.0)
+    regexp_parser (1.6.0)
+    responders (3.0.0)
+      actionpack (>= 5.0)
+      railties (>= 5.0)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-rails (6.0.3)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      railties (>= 6.1)
-      rspec-core (~> 3.12)
-      rspec-expectations (~> 3.12)
-      rspec-mocks (~> 3.12)
-      rspec-support (~> 3.12)
-    rspec-support (3.12.1)
-    rubocop (1.56.4)
-      base64 (~> 0.1.1)
-      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
-      parallel (~> 1.10)
-      parser (>= 3.2.2.3)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    rubocop-performance (1.19.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.13.0)
-    rubyzip (2.3.2)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    ruby_dep (1.5.0)
+    rubyzip (1.2.4)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.1.0)
-      railties (>= 5.2.0)
+    sass-rails (5.0.7)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    securerandom (0.4.1)
-    selenium-webdriver (4.10.0)
-      rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
-      websocket (~> 1.0)
-    sentry-rails (5.22.1)
-      railties (>= 5.0)
-      sentry-ruby (~> 5.22.1)
-    sentry-ruby (5.22.1)
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    selenium-webdriver (3.142.4)
+      childprocess (>= 0.5, < 3.0)
+      rubyzip (~> 1.2, >= 1.2.2)
     shoulda-matchers (3.1.3)
       activesupport (>= 4.0.0)
-    simplecov (0.22.0)
+    simplecov (0.17.0)
       docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.4)
-    snaky_hash (2.0.3)
-      hashie (>= 0.1.0, < 6)
-      version_gem (>= 1.1.8, < 3)
-    spring (3.0.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    spring (2.1.0)
+    spring-watcher-listen (2.0.1)
+      listen (>= 2.7, < 4.0)
+      spring (>= 1.2, < 3.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    stackprof (0.2.26)
-    standard (1.31.1)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.0)
-      rubocop (~> 1.56.2)
-      standard-custom (~> 1.0.0)
-      standard-performance (~> 1.2)
-    standard-custom (1.0.2)
-      lint_roller (~> 1.0)
-      rubocop (~> 1.50)
-    standard-performance (1.2.0)
-      lint_roller (~> 1.1)
-      rubocop-performance (~> 1.19.0)
-    standardrb (1.0.1)
-      standard
-    stringio (3.1.7)
-    terser (1.1.18)
-      execjs (>= 0.3.0, < 3)
-    thor (1.3.2)
-    tilt (2.3.0)
-    timeout (0.4.3)
-    turbolinks (5.2.1)
+    ten_years_rails (0.2.0)
+      actionview
+      activesupport
+      colorize (>= 0.8.1)
+      rest-client (>= 2.0.2)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tilt (2.0.9)
+    turbolinks (5.2.0)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    uri (1.0.3)
-    version_gem (1.1.8)
-    warden (1.2.9)
-      rack (>= 2.0.9)
-    web-console (4.2.1)
-      actionview (>= 6.0.0)
-      activemodel (>= 6.0.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    uglifier (4.1.20)
+      execjs (>= 0.3.0, < 3)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.6)
+    warden (1.2.8)
+      rack (>= 2.0.6)
+    web-console (3.7.0)
+      actionview (>= 5.0)
+      activemodel (>= 5.0)
       bindex (>= 0.4.0)
-      railties (>= 6.0.0)
-    webdrivers (5.3.1)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0, < 4.11)
-    webrick (1.9.1)
-    websocket (1.2.10)
-    websocket-driver (0.8.0)
-      base64
+      railties (>= 5.0)
+    websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
+    websocket-extensions (0.1.4)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.3)
 
 PLATFORMS
-  arm64-darwin-23
-  x86_64-darwin-21
-  x86_64-darwin-22
-  x86_64-linux
+  ruby
 
 DEPENDENCIES
   acts_as_list
   apparition!
-  bootstrap-sass (= 3.4.1)
-  bourbon
+  bootstrap-sass (= 3.3.7)
   byebug
   capybara
   capybara-screenshot
-  coffee-script
-  database_cleaner-active_record (>= 2.1.0)
+  coffee-rails (~> 4.2)
+  database_cleaner
+  devise
   dotenv-rails
   factory_bot_rails
   faker
   jbuilder (~> 2.5)
   jquery-rails
-  jquery-ui-rails (~> 6.0)
-  listen (~> 3.7)
-  madmin (~> 1.2)
-  matrix
-  mimemagic (~> 0.3.8)
-  newrelic_rpm
-  next_rails
-  ombu_labs-auth
-  pg
-  puma (~> 6.5)
-  pundit (~> 2.2)
-  rack-mini-profiler
-  rails (~> 7.1.0)
+  jquery-ui-rails (~> 5.0, >= 5.0.5)
+  listen (>= 3.0.5, < 3.2)
+  omniauth-github
+  pg (~> 0.18)
+  puma (~> 3.7)
+  rails (~> 5.1.4)
   rails-controller-testing
   recursive-open-struct
-  redcarpet (~> 3.5.1)
-  rspec-rails (~> 6.0.3)
+  redcarpet (~> 3.0.0)
+  rspec-rails (~> 3.7)
   sass-rails (~> 5.0)
-  sentry-rails
-  sentry-ruby
+  selenium-webdriver
   shoulda-matchers (~> 3.1)
   simplecov
-  spring (= 3.0.0)
-  stackprof
-  standardrb
-  terser
+  spring
+  spring-watcher-listen (~> 2.0.0)
+  ten_years_rails
   turbolinks (~> 5)
   tzinfo-data
+  uglifier (>= 1.3.0)
   web-console (>= 3.3.0)
-  webdrivers
-
-RUBY VERSION
-   ruby 3.2.3p157
 
 BUNDLED WITH
-   2.4.13
+   1.17.3
diff --git a/Gemfile.next.lock b/Gemfile.next.lock
index 5ce2bf8b..16cf1264 100644
--- a/Gemfile.next.lock
+++ b/Gemfile.next.lock
@@ -1,519 +1,292 @@
-GIT
-  remote: https://github.com/twalpole/apparition.git
-  revision: 7db58cc6b0e4ca4141b074ff27d5936a1b8874bf
-  ref: 7db58cc6b0e4ca4141b074ff27d5936a1b8874bf
-  specs:
-    apparition (0.4.0)
-      capybara (~> 3.13, < 4)
-      websocket-driver (>= 0.6.5)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actioncable (5.2.3)
+      actionpack (= 5.2.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-      zeitwerk (~> 2.6)
-    actionmailbox (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
-      mail (>= 2.8.0)
-    actionmailer (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      actionview (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
-      mail (>= 2.8.0)
-      rails-dom-testing (~> 2.2)
-    actionpack (7.2.2.1)
-      actionview (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
-      nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4, < 3.2)
-      rack-session (>= 1.0.1)
+    actionmailer (5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
+      rack (~> 2.0)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-      useragent (~> 0.16)
-    actiontext (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
-      globalid (>= 0.6.0)
-      nokogiri (>= 1.8.5)
-    actionview (7.2.2.1)
-      activesupport (= 7.2.2.1)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
       builder (~> 3.1)
-      erubi (~> 1.11)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    activejob (7.2.2.1)
-      activesupport (= 7.2.2.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.3)
+      activesupport (= 5.2.3)
       globalid (>= 0.3.6)
-    activemodel (7.2.2.1)
-      activesupport (= 7.2.2.1)
-    activerecord (7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
-      timeout (>= 0.4.0)
-    activestorage (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
-      marcel (~> 1.0)
-    activesupport (7.2.2.1)
-      base64
-      benchmark (>= 0.3)
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
-      minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-    acts_as_list (1.1.0)
-      activerecord (>= 4.2)
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
-    ast (2.4.2)
-    autoprefixer-rails (10.4.15.0)
-      execjs (~> 2)
-    base64 (0.1.2)
-    bcrypt (3.1.20)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
-    bindex (0.8.1)
-    bootstrap-sass (3.4.1)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
+      arel (>= 9.0)
+    activestorage (5.2.3)
+      actionpack (= 5.2.3)
+      activerecord (= 5.2.3)
+      marcel (~> 0.3.1)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    arel (9.0.0)
+    autoprefixer-rails (9.5.1)
+      execjs
+    bcrypt (3.1.12)
+    bindex (0.7.0)
+    bootstrap-sass (3.3.7)
       autoprefixer-rails (>= 5.2.1)
-      sassc (>= 2.0.0)
-    bourbon (7.3.0)
-      thor (~> 1.0)
-    builder (3.3.0)
-    byebug (11.1.3)
-    capybara (3.39.2)
+      sass (>= 3.3.4)
+    builder (3.2.3)
+    byebug (11.0.1)
+    capybara (2.18.0)
       addressable
-      matrix
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
-      rack (>= 1.6.0)
-      rack-test (>= 0.6.3)
-      regexp_parser (>= 1.5, < 3.0)
-      xpath (~> 3.2)
-    capybara-screenshot (1.0.26)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (>= 2.0, < 4.0)
+    capybara-screenshot (1.0.22)
       capybara (>= 1.0, < 4)
       launchy
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
+    coffee-rails (4.2.2)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    colorize (1.1.0)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.2)
-    crass (1.0.6)
-    database_cleaner-active_record (2.2.0)
-      activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
-    database_cleaner-core (2.0.1)
-    date (3.4.1)
-    devise (4.9.4)
+    colorize (0.8.1)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
+    devise (4.6.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
+      railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    dotenv (2.8.1)
-    dotenv-rails (2.8.1)
-      dotenv (= 2.8.1)
-      railties (>= 3.2)
-    drb (2.2.1)
-    erubi (1.13.1)
-    execjs (2.9.1)
-    factory_bot (6.2.1)
-      activesupport (>= 5.0.0)
-    factory_bot_rails (6.2.0)
-      factory_bot (~> 6.2.0)
-      railties (>= 5.0.0)
-    faker (3.2.1)
-      i18n (>= 1.8.11, < 2)
-    faraday (2.13.0)
-      faraday-net_http (>= 2.0, < 3.5)
-      json
-      logger
-    faraday-net_http (3.4.0)
-      net-http (>= 0.5.0)
-    ffi (1.16.3)
-    globalid (1.2.1)
-      activesupport (>= 6.1)
-    hashie (5.0.0)
-    i18n (1.14.7)
-      concurrent-ruby (~> 1.0)
-    io-console (0.8.0)
-    irb (1.15.2)
-      pp (>= 0.6.0)
-      rdoc (>= 4.0.0)
-      reline (>= 0.4.2)
-    jbuilder (2.11.5)
-      actionview (>= 5.0.0)
-      activesupport (>= 5.0.0)
-    jquery-rails (4.6.0)
-      rails-dom-testing (>= 1, < 3)
+    diff-lcs (1.3)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
+    erubi (1.8.0)
+    execjs (2.7.0)
+    factory_bot (5.0.2)
+      activesupport (>= 4.2.0)
+    factory_bot_rails (5.0.2)
+      factory_bot (~> 5.0.2)
       railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
-    jquery-ui-rails (6.0.1)
-      railties (>= 3.2.16)
-    json (2.6.3)
-    jwt (2.10.1)
-      base64
-    language_server-protocol (3.17.0.3)
-    launchy (2.5.2)
-      addressable (~> 2.8)
-    lint_roller (1.1.0)
-    listen (3.8.0)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.7.0)
-    loofah (2.24.0)
+    faker (1.9.3)
+      i18n (>= 0.7)
+    ffi (1.10.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    jbuilder (2.8.0)
+      activesupport (>= 4.2.0)
+      multi_json (>= 1.2)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    loofah (2.2.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    madmin (1.2.8)
-      pagy (>= 3.5)
-      rails (>= 6.0.3)
-    mail (2.8.1)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.0.4)
-    matrix (0.4.2)
-    mimemagic (0.3.10)
-      nokogiri (~> 1)
-      rake
-    mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
-    minitest (5.25.5)
-    multi_xml (0.7.1)
-      bigdecimal (~> 3.1)
-    net-http (0.6.0)
-      uri
-    net-imap (0.5.7)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.2)
-      timeout
-    net-smtp (0.5.1)
-      net-protocol
-    newrelic_rpm (9.5.0)
-    next_rails (1.3.0)
-      colorize (>= 0.8.1)
-    nio4r (2.7.4)
-    nokogiri (1.18.8)
-      mini_portile2 (~> 2.8.2)
-      racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
-      racc (~> 1.4)
-    oauth2 (2.0.9)
-      faraday (>= 0.17.3, < 3.0)
-      jwt (>= 1.0, < 3.0)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 4)
-      snaky_hash (~> 2.0)
-      version_gem (~> 1.1)
-    ombu_labs-auth (1.1.0)
-      devise (~> 4.9)
-      omniauth (~> 2.1.0)
-      omniauth-github (~> 2.0.0)
-      omniauth-rails_csrf_protection
-      rails (>= 6.0, < 8.1)
-    omniauth (2.1.3)
-      hashie (>= 3.4.6)
-      rack (>= 2.2.3)
-      rack-protection
-    omniauth-github (2.0.1)
-      omniauth (~> 2.0)
-      omniauth-oauth2 (~> 1.8)
-    omniauth-oauth2 (1.8.0)
-      oauth2 (>= 1.4, < 3)
-      omniauth (~> 2.0)
-    omniauth-rails_csrf_protection (1.0.2)
-      actionpack (>= 4.2)
-      omniauth (~> 2.0)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    netrc (0.11.0)
+    nio4r (2.3.1)
+    nokogiri (1.10.2)
+      mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
-    pagy (6.1.0)
-    parallel (1.23.0)
-    parser (3.2.2.4)
-      ast (~> 2.4.1)
-      racc
-    pg (1.5.4)
-    pp (0.6.2)
-      prettyprint
-    prettyprint (0.2.0)
-    psych (5.2.3)
-      date
-      stringio
-    public_suffix (5.0.3)
-    puma (6.6.0)
-      nio4r (~> 2.0)
-    pundit (2.3.1)
-      activesupport (>= 3.0.0)
-    racc (1.8.1)
-    rack (2.2.13)
-    rack-mini-profiler (3.1.1)
-      rack (>= 1.2.0)
-    rack-protection (3.2.0)
-      base64 (>= 0.1.0)
-      rack (~> 2.2, >= 2.2.4)
-    rack-session (1.0.2)
-      rack (< 3)
-    rack-test (2.2.0)
-      rack (>= 1.3)
-    rackup (1.0.1)
-      rack (< 3)
-      webrick
-    rails (7.2.2.1)
-      actioncable (= 7.2.2.1)
-      actionmailbox (= 7.2.2.1)
-      actionmailer (= 7.2.2.1)
-      actionpack (= 7.2.2.1)
-      actiontext (= 7.2.2.1)
-      actionview (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
-      bundler (>= 1.15.0)
-      railties (= 7.2.2.1)
-    rails-controller-testing (1.0.5)
-      actionpack (>= 5.0.1.rc1)
-      actionview (>= 5.0.1.rc1)
-      activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.2.0)
-      activesupport (>= 5.0.0)
-      minitest
+    pg (0.21.0)
+    public_suffix (3.0.3)
+    puma (3.12.1)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.3)
+      actioncable (= 5.2.3)
+      actionmailer (= 5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      activemodel (= 5.2.3)
+      activerecord (= 5.2.3)
+      activestorage (= 5.2.3)
+      activesupport (= 5.2.3)
+      bundler (>= 1.3.0)
+      railties (= 5.2.3)
+      sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.4)
+      actionpack (>= 5.0.1.x)
+      actionview (>= 5.0.1.x)
+      activesupport (>= 5.0.1.x)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
-      irb (~> 1.13)
-      rackup (>= 1.0.0)
-      rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
-      zeitwerk (~> 2.6)
-    rainbow (3.1.1)
-    rake (13.2.1)
-    rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.2)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
       ffi (~> 1.0)
-    rdoc (6.13.1)
-      psych (>= 4.0.0)
-    recursive-open-struct (1.1.3)
-    redcarpet (3.5.1)
-    regexp_parser (2.8.1)
-    reline (0.6.1)
-      io-console (~> 0.5)
-    responders (3.1.1)
-      actionpack (>= 5.2)
-      railties (>= 5.2)
-    rexml (3.2.6)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    redcarpet (3.0.0)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
+    rest-client (2.0.2)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-rails (6.0.3)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      railties (>= 6.1)
-      rspec-core (~> 3.12)
-      rspec-expectations (~> 3.12)
-      rspec-mocks (~> 3.12)
-      rspec-support (~> 3.12)
-    rspec-support (3.12.1)
-    rubocop (1.56.4)
-      base64 (~> 0.1.1)
-      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
-      parallel (~> 1.10)
-      parser (>= 3.2.2.3)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    rubocop-performance (1.19.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.13.0)
-    rubyzip (2.3.2)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    ruby_dep (1.5.0)
+    rubyzip (1.2.2)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.1.0)
-      railties (>= 5.2.0)
+    sass-rails (5.0.7)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    securerandom (0.4.1)
-    selenium-webdriver (4.10.0)
-      rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
-      websocket (~> 1.0)
-    sentry-rails (5.22.1)
-      railties (>= 5.0)
-      sentry-ruby (~> 5.22.1)
-    sentry-ruby (5.22.1)
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    selenium-webdriver (3.141.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.2, >= 1.2.2)
     shoulda-matchers (3.1.3)
       activesupport (>= 4.0.0)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.4)
-    snaky_hash (2.0.1)
-      hashie
-      version_gem (~> 1.1, >= 1.1.1)
-    spring (3.0.0)
+    spring (2.0.2)
+      activesupport (>= 4.2)
+    spring-watcher-listen (2.0.1)
+      listen (>= 2.7, < 4.0)
+      spring (>= 1.2, < 3.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    stackprof (0.2.26)
-    standard (1.31.1)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.0)
-      rubocop (~> 1.56.2)
-      standard-custom (~> 1.0.0)
-      standard-performance (~> 1.2)
-    standard-custom (1.0.2)
-      lint_roller (~> 1.0)
-      rubocop (~> 1.50)
-    standard-performance (1.2.0)
-      lint_roller (~> 1.1)
-      rubocop-performance (~> 1.19.0)
-    standardrb (1.0.1)
-      standard
-    stringio (3.1.7)
-    terser (1.1.18)
-      execjs (>= 0.3.0, < 3)
-    thor (1.3.2)
-    tilt (2.3.0)
-    timeout (0.4.3)
-    turbolinks (5.2.1)
+    ten_years_rails (0.2.0)
+      actionview
+      activesupport
+      colorize (>= 0.8.1)
+      rest-client (>= 2.0.2)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tilt (2.0.9)
+    turbolinks (5.2.0)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    uri (1.0.3)
-    useragent (0.16.11)
-    version_gem (1.1.7)
-    warden (1.2.9)
-      rack (>= 2.0.9)
-    web-console (4.2.1)
-      actionview (>= 6.0.0)
-      activemodel (>= 6.0.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    uglifier (4.1.20)
+      execjs (>= 0.3.0, < 3)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+    warden (1.2.8)
+      rack (>= 2.0.6)
+    web-console (3.7.0)
+      actionview (>= 5.0)
+      activemodel (>= 5.0)
       bindex (>= 0.4.0)
-      railties (>= 6.0.0)
-    webdrivers (5.3.1)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0, < 4.11)
-    webrick (1.9.1)
-    websocket (1.2.10)
-    websocket-driver (0.7.7)
-      base64
+      railties (>= 5.0)
+    websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
+    websocket-extensions (0.1.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.2)
 
 PLATFORMS
   ruby
-  x86_64-linux
 
 DEPENDENCIES
-  acts_as_list
-  apparition!
-  bootstrap-sass (= 3.4.1)
-  bourbon
+  bootstrap-sass (= 3.3.7)
   byebug
-  capybara
+  capybara (~> 2.13)
   capybara-screenshot
-  coffee-script
-  database_cleaner-active_record (>= 2.1.0)
-  dotenv-rails
+  coffee-rails (~> 4.2)
+  database_cleaner
+  devise
   factory_bot_rails
   faker
   jbuilder (~> 2.5)
-  jquery-rails
-  jquery-ui-rails (~> 6.0)
-  listen (~> 3.7)
-  madmin (~> 1.2)
-  matrix
-  mimemagic (~> 0.3.8)
-  newrelic_rpm
-  next_rails
-  ombu_labs-auth
-  pg
-  puma (~> 6.5)
-  pundit (~> 2.2)
-  rack-mini-profiler
-  rails (~> 7.2.0)
+  listen (>= 3.0.5, < 3.2)
+  pg (~> 0.18)
+  puma (~> 3.7)
+  rails (~> 5.2.3)
   rails-controller-testing
-  recursive-open-struct
-  redcarpet (~> 3.5.1)
-  rspec-rails (~> 6.0.3)
+  redcarpet (~> 3.0.0)
+  rspec-rails (~> 3.7)
   sass-rails (~> 5.0)
-  sentry-rails
-  sentry-ruby
+  selenium-webdriver
   shoulda-matchers (~> 3.1)
-  simplecov
-  spring (= 3.0.0)
-  stackprof
-  standardrb
-  terser
+  spring
+  spring-watcher-listen (~> 2.0.0)
+  ten_years_rails
   turbolinks (~> 5)
   tzinfo-data
+  uglifier (>= 1.3.0)
   web-console (>= 3.3.0)
-  webdrivers
-
-RUBY VERSION
-   ruby 3.2.3p157
 
 BUNDLED WITH
-   2.5.16
+   1.17.3
diff --git a/Procfile b/Procfile
deleted file mode 100644
index 90ae0ac4..00000000
--- a/Procfile
+++ /dev/null
@@ -1,2 +0,0 @@
-web: bundle exec puma -C config/puma.rb
-release: bundle exec rake db:migrate
diff --git a/README.md b/README.md
index fe1dac2d..1923ce8b 100644
--- a/README.md
+++ b/README.md
@@ -1,129 +1,29 @@
-# Points
+# Points Application
 
-[![Points](https://github.com/fastruby/points/actions/workflows/tests.yml/badge.svg)](https://github.com/fastruby/points/actions/workflows/tests.yml)
-[![Maintainability](https://api.codeclimate.com/v1/badges/2484911d9c021cfee1ce/maintainability)](https://codeclimate.com/github/fastruby/points/maintainability)
-
-This is a Rails application to collaboratively estimate stories.
+This is a Rails application to collaboratively estimate stories
 
 ## Getting started
 
-To get started with the app, clone the repo and then install the needed gems running the setup script:
-
-```
-$ ./bin/setup
-```
-
-## Environment Variables
-
-`ORGANIZATION_LOGIN`: This is the organization name as it appears in the GitHub URL, for instance `orgname` in https://github.com/orgname. It is needed to check if users are a part of the organization. Ensure that your membership is set to _public_ when you visit https://github.com/orgs/orgname/people.
-
-If you don't belong to any organization, you can set up one here: https://github.com/organizations/plan
-
-Make sure you add your organization to the `.env` file like this:
-
-```
-ORGANIZATION_LOGIN=orgname
-```
-
-`GITHUB_APP_ID` and `GITHUB_APP_SECRET`: These are the credentials of the OAuth GitHub App that you need to create. Follow the instructions on this link to create one: [Creating an OAuth GitHub App](https://docs.github.com/en/developers/apps/building-oauth-apps/creating-an-oauth-app)
-
-When creating the OAuth GitHub App, the `Homepage URL` field should be set to http://localhost:3000, and the `Authorization callback URL` should be http://localhost:3000/users/auth/github/callback.
-
-Once you create the app and generate credentials for it, make sure you add them to the `.env` file like this:
+To get started with the app, clone the repo and then install the needed gems:
 
 ```
-GITHUB_APP_ID=xxxxxxxxxxxxxxxxxxxx
-GITHUB_APP_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+$ bundle install 
 ```
 
-`SHOW_DEVELOPER_AUTH=true` can be used to allow easy login without requiring GitHub's setup during local development or in safe review environments.
-
-## Starting the Server
+Next, migrate the database:
 
 ```
-$ rails s
+$ rails db:migrate
 ```
 
-Go to http://localhost:3000
-
-## Running Tests
+Finally, run the test suite to verify that everything is working correctly:
 
 ```
-$ rails spec
+$ rails test
 ```
 
-## Using Docker
-
-> NOTE: You'll need to have docker and docker-compose installed
+If the test suite passes, you'll be ready to run the app in a local server:
 
-Build the points docker image
-
-```bash
-./bin/setup_with_docker
 ```
-
-Run the app
-
+$ rails server
 ```
-./bin/start_with_docker
-
-or
-
-docker-compose up web-next
-```
-
-## Admin Users
-
-Users are created without admin privileges by default, because admin users have access to a few more features related to reports and setting real score of stories.
-
-Currently, the only way to flag a user as `admin` is a direct database update using either postgres cli or the rails console.
-
-If you want to set the flag for a user, you can follow these steps:
-
-```bash
-rails console
-
-or
-
-docker-compose run --rm web rails console
-```
-
-and then:
-
-```ruby
-User.find_by(email: "user@example.com").update_attribute(:admin, true)
-```
-
-## Rack Mini Profiler
-
-To enable the Rack Mini Profiler widget, add the `?enable_rack_mini_profiler` query string to any url. The widget will stay on for all requests until disabled.
-
-To disable the Rack Mini Profiler widget, add the `?disable_rack_mini_profiler` query string to any url.
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at [https://github.com/fastruby/points](https://github.com/fastruby/points). This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-
-When Submitting a Pull Request:
-
-- If your PR closes any open GitHub issues, please include `Closes #XXXX` in your comment
-
-- Please include a summary of the change and which issue is fixed or which feature is introduced.
-
-- If changes to the behavior are made, clearly describe what changes.
-
-- If changes to the UI are made, please include screenshots of the before and after.
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the Points project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/fastruby/points/CODE_OF_CONDUCT.md).
-
-## Sponsorship
-
-![FastRuby.io | Rails Upgrade Services](https://github.com/fastruby/points/raw/main/app/assets/images/fastruby-logo.png)
-
-`Points` is maintained and funded by [FastRuby.io](https://fastruby.io). The names and logos for FastRuby.io are trademarks of The Lean Software Boutique LLC.
diff --git a/Rakefile b/Rakefile
index 9a5ea738..e85f9139 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require_relative "config/application"
+require_relative 'config/application'
 
 Rails.application.load_tasks
diff --git a/app.json b/app.json
deleted file mode 100644
index 625755e6..00000000
--- a/app.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "points",
-  "scripts": {
-    "postdeploy": "bundle exec rails db:migrate"
-  },
-  "env": {},
-  "formation": {
-    "web": {
-      "quantity": 1
-    }
-  },
-  "addons": ["heroku-postgresql"],
-  "buildpacks": [
-    {
-      "url": "heroku/ruby"
-    }
-  ],
-    "stack": "heroku-22"
-}
diff --git a/app/assets/images/fastruby-logo.png b/app/assets/images/fastruby-logo.png
deleted file mode 100644
index 5a90e4b2..00000000
Binary files a/app/assets/images/fastruby-logo.png and /dev/null differ
diff --git a/app/assets/javascripts/action_plan.js b/app/assets/javascripts/action_plan.js
deleted file mode 100644
index 9de1c443..00000000
--- a/app/assets/javascripts/action_plan.js
+++ /dev/null
@@ -1,27 +0,0 @@
-document.addEventListener("turbolinks:load", function () {
-  $("#action-plan-prefix").keyup(function (event) {
-    const prefix = event.target.value.trim();
-
-    document
-      .querySelectorAll(".action-plan_heading > span.index")
-      .forEach((el) => {
-        const suffix = prefix.length === 0 ? "" : `.${el.dataset.idx}`;
-        el.innerText = `${prefix}${suffix} `;
-      });
-  });
-
-  const togglePopup = function (id) {
-    setTimeout(() => {
-      $(`#story_${id} .popup`).toggle(300);
-    }, 1000);
-  };
-
-  let clipboard = new ClipboardJS(".btn-clipboard");
-  clipboard.on("success", function (e) {
-    // e.text is the story url, for example: "points.com/stories/xxxx"
-    const id = e.text.split("/").slice(-1);
-
-    $(`#story_${id} .popup`).toggle(300, togglePopup(id));
-    e.clearSelection();
-  });
-});
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index b8ed8646..76aa7b0d 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -14,8 +14,6 @@
 //= require jquery
 //= require bootstrap-sprockets
 //= require jquery-ui/widget
-//= require jquery-ui/widgets/sortable
+//= require jquery-ui/sortable
 //= require turbolinks
-//= require clipboard.min
-//= require sortable_list
 //= require_tree .
diff --git a/app/assets/javascripts/home.coffee b/app/assets/javascripts/home.coffee
new file mode 100644
index 00000000..24f83d18
--- /dev/null
+++ b/app/assets/javascripts/home.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/modal.js b/app/assets/javascripts/modal.js
deleted file mode 100644
index 2a522be7..00000000
--- a/app/assets/javascripts/modal.js
+++ /dev/null
@@ -1,21 +0,0 @@
-let modal = false
-document.addEventListener("turbolinks:load", () => {
-  modal = document.querySelector(".modal")
-})
-
-// show a new Modal with a given title and body
-function showModal(title, body) {
-  updateModal(title, body)
-  $(modal).modal('show')
-}
-
-// update the Modal title and body
-function updateModal(title, body) {
-  modal.querySelector(".modal-title").innerHTML = title
-  modal.querySelector(".modal-body").innerHTML = body
-}
-
-// closes the modal
-function closeModal() {
-  $(modal).modal('hide')
-}
diff --git a/app/assets/javascripts/project.js b/app/assets/javascripts/project.js
index e8eae375..ba0e433a 100644
--- a/app/assets/javascripts/project.js
+++ b/app/assets/javascripts/project.js
@@ -1,120 +1,36 @@
-document.addEventListener("turbolinks:load", function () {
-  $("input[name='stories[]']").click(() => {
-    const selected = $("input[name='stories[]']:checked");
-    const is_unlocked = $("#stories").data("unlocked");
-    if (!is_unlocked) {
-      return;
-    }
-
-    if (selected.length > 0) {
-      const ending = selected.length == 1 ? "y" : "ies";
-      $("#bulk_delete")
-        .text(`Bulk Delete (${selected.length} Stor${ending})`)
-        .attr("aria-disabled", "false")
-        .prop("disabled", false);
-    } else {
-      $("#bulk_delete")
-        .text("Bulk Delete")
-        .attr("aria-disabled", "true")
-        .prop("disabled", true);
-    }
-  });
-
-  $(".import-export-header").click(function () {
-    $(this).children(".rotate").toggleClass("left");
-  });
-
-  $("#bulk_delete").click((event) => {
-    let stories_ids = [];
+$(() => {
+  $("#bulk_delete").click(() => {
+    let stories_ids = []
     $("input[name='stories[]']:checked").each((_, checkbox) => {
-      stories_ids.push($(checkbox).val());
-    });
+      stories_ids.push($(checkbox).val())
+    })
 
-    const ending = stories_ids.length == 1 ? "y" : "ies";
-    let user_confirmation = confirm(
-      `Are you sure you want to delete ${stories_ids.length} stor${ending}?`
-    );
-    if (!user_confirmation) return;
-
-    $(event.target)
-      .text("Bulk Delete")
-      .attr("aria-disabled", "true")
-      .prop("disabled", true);
-
-    let token = $("meta[name='csrf-token']").attr("content");
+    let token = $("meta[name='csrf-token']").attr("content")
     $.ajaxSetup({
       beforeSend: function (xhr) {
         xhr.setRequestHeader("X-CSRF-Token", token);
-      },
+      }
     });
 
     $.ajax({
       url: "/https/github.com/stories/bulk_destroy",
-      data: { ids: stories_ids },
+      data: {ids: stories_ids},
       type: "POST",
       success: () => {
         $(stories_ids).each((_, id) => {
-          console.log(id);
+          console.log(id)
           $("#story_" + id).remove();
-        });
+        })
       },
       error: (result) => {
-        console.log("There was an error destroying the stories");
-      },
-    });
-  });
-
-  // bind select/unselect all when cloning projects
-  document.querySelectorAll("#select-all, #unselect-all").forEach((button) => {
-    const setCheck = button.id === "select-all" ? true : false;
-
-    button.addEventListener("click", (e) => {
-      e.preventDefault();
-      toggleCloneSubProjects(setCheck);
-    });
-  });
+        console.log("There was an error destroying the stories")
+      }
+    })
+    console.log(stories_ids)
+  })
+})
 
-  // unselect all if clone is not a parent
-  const projectCloneParent = document.getElementById("project_parent_id");
-  const subProjects = document.getElementById("sub-projects-to-clone");
 
-  if (projectCloneParent && subProjects) {
-    projectCloneParent.addEventListener("change", (e) => {
-      if (projectCloneParent.value !== "") {
-        subProjects.classList.add("is-not-parent");
-      } else {
-        subProjects.classList.remove("is-not-parent");
-      }
-    });
-  }
-});
 
-const filterStories = () => {
-  const searchTerm = document
-    .getElementById("title_contains")
-    .value.toLowerCase()
-    .trim();
-  if (searchTerm.length == 0) {
-    $("#stories").sortable("enable");
-  } else {
-    $("#stories").sortable("disable");
-  }
 
-  document.querySelectorAll("#stories tr").forEach(function (element) {
-    const cl = element.classList;
-    const storyTitle = element
-      .querySelector("td:first-child")
-      .innerText.toLowerCase();
-    if (storyTitle.includes(searchTerm) || element.id.replace(/\D/g, '').includes(searchTerm)) {
-      cl.remove("hidden");
-    } else {
-      cl.add("hidden");
-    }
-  });
-};
 
-function toggleCloneSubProjects(value) {
-  document
-    .querySelectorAll("#sub-projects-to-clone input[type='checkbox']")
-    .forEach((el) => (el.checked = value));
-}
diff --git a/app/assets/javascripts/projects.js b/app/assets/javascripts/projects.js
deleted file mode 100644
index 0c2ec4d0..00000000
--- a/app/assets/javascripts/projects.js
+++ /dev/null
@@ -1,31 +0,0 @@
-document.addEventListener("turbolinks:load", function () {
-  const projectTitle = document.querySelector(".project-title");
-  if (projectTitle) {
-    const titleButton = projectTitle.querySelector("button");
-    const titleForm = projectTitle.querySelector("form");
-    const titleInput = titleForm.querySelector("#project_title");
-
-    titleButton.addEventListener("click", () => {
-      projectTitle.classList.toggle("editing");
-
-      // focus input and move caret at the end of text
-      titleInput.focus();
-      titleInput.select();
-      titleInput.selectionStart = titleInput.selectionEnd =
-        titleInput.value.length;
-    });
-
-    titleForm.querySelector("button.cancel").addEventListener("click", (e) => {
-      e.preventDefault();
-      projectTitle.classList.toggle("editing");
-      titleInput.value = titleButton.innerText;
-    });
-
-    // trim input on blur to prevent empty values
-    titleInput.addEventListener("blur", (e) => {
-      let val = e.target.value;
-      val = val.trim();
-      e.target.value = val;
-    });
-  }
-});
diff --git a/app/assets/javascripts/sortable_list.js b/app/assets/javascripts/sortable_list.js
deleted file mode 100644
index 2fa5ad34..00000000
--- a/app/assets/javascripts/sortable_list.js
+++ /dev/null
@@ -1,16 +0,0 @@
-document.addEventListener("turbolinks:load", function () {
-  $("#stories, .sortable-projects").sortable({
-    update: function (e, ui) {
-      const parent = ui.item[0].closest("div.project-card, .project-table");
-      parent.classList.add("sorting");
-      Rails.ajax({
-        type: "PATCH",
-        url: this.dataset.url,
-        data: $(this).sortable("serialize"),
-        complete: () => {
-          parent.classList.remove("sorting");
-        },
-      });
-    },
-  });
-});
diff --git a/app/assets/javascripts/stories.js b/app/assets/javascripts/stories.js
index 5e7da51b..e217fa88 100644
--- a/app/assets/javascripts/stories.js
+++ b/app/assets/javascripts/stories.js
@@ -1,45 +1,20 @@
-document.addEventListener("DOMContentLoaded", () => {
-  document.querySelectorAll("[data-has-preview]").forEach((element) => {
-    let debounceTimer;
+document.addEventListener("turbolinks:load", function() {
+  $("#stories").sortable({
+    update: function(e, ui) {
+      var AUTH_TOKEN = $('meta[name=csrf-token]').attr('content');
 
-    element.addEventListener("input", (e) => {
-      const updateMarkdown = () => {
-        const form = element.closest("form");
-        const preview = form.querySelector(
-          "." + element.dataset.previewTarget + " .content"
-        );
-        if (preview) {
-          Rails.ajax({
-            type: "POST",
-            url: "/https/github.com/stories/render_markdown",
-            data: `markdown=${encodeURIComponent(element.value)}`,
-            dataType: "text",
-            success: (response) => {
-              preview.innerHTML = response;
-            },
-          });
+      $.ajaxPrefilter(function(options, originalOptions, xhr) {
+        if (!options.crossDomain) {
+          token = $('meta[name="csrf-token"]').attr('content');
+          if (token) xhr.setRequestHeader('X-CSRF-Token', token);
         }
-      };
+      });
 
-      window.clearTimeout(debounceTimer);
-      debounceTimer = window.setTimeout(updateMarkdown, 300);
-    });
+      $.ajax({
+        url: $(this).data("url") + "?&authenticity_token=" + AUTH_TOKEN,
+        type: "PATCH",
+        data: $(this).sortable('serialize'),
+      });
+    }
   });
 });
-
-function updateStatusButton(color, status) {
-  const button = document.querySelector(".story-title .dropdown-wrapper > button");
-  button.className = `button ${color}`;
-
-  const span = button.querySelector("span");
-  span.textContent = status;
-
-  document.querySelector(":focus").blur();
-}
-
-function updateStatusLabel(status, storyId) {
-  let row = document.getElementById(`story_${storyId}`)
-  status_label = row.querySelector(".status > .story-status-badge")
-  status_label.textContent = status
-  status_label.classList.value = `story-status-badge ${status}`
-}
diff --git a/app/assets/javascripts/users.coffee b/app/assets/javascripts/users.coffee
new file mode 100644
index 00000000..24f83d18
--- /dev/null
+++ b/app/assets/javascripts/users.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/1-utilities/_basic.scss b/app/assets/stylesheets/1-utilities/_basic.scss
deleted file mode 100644
index ddedbd03..00000000
--- a/app/assets/stylesheets/1-utilities/_basic.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-/* === BASIC */
-/* ========================== */
-
-* {
-  margin: 0;
-  padding: 0;
-  box-sizing: border-box;
-}
-main {
-  min-height: calc(100vh - 160px);
-  padding-bottom: 60px;
-}
-::selection {
-  background: $orange;
-}
-::-moz-selection {
-  background: $orange;
-}
-section {
-  overflow: auto;
-}
-textarea {
-  resize: vertical;
-}
-.hidden {
-  display: none;
-}
diff --git a/app/assets/stylesheets/1-utilities/_grid.scss b/app/assets/stylesheets/1-utilities/_grid.scss
deleted file mode 100644
index c3b758b6..00000000
--- a/app/assets/stylesheets/1-utilities/_grid.scss
+++ /dev/null
@@ -1,77 +0,0 @@
-/* === GRID */
-/* ========================== */
-
-.row {
-  //margin-left: -$gutter/2;
-  margin-left: auto;
-  //margin-right: -$gutter/2;
-  margin-right: auto;
-  max-width: $breakpoint_1200px;
-  &:before {
-    // Magic learned from Bootstrap
-    content: " ";
-    display: table;
-  }
-  &:after {
-    // Magic learned from Bootstrap
-    content: " ";
-    display: table;
-    clear: both;
-  }
-}
-.column {
-  position: relative;
-  min-height: 1px;
-  padding-left: $gutter/2;
-  padding-right: $gutter/2;
-  float: left;
-  box-sizing: border-box;
-}
-
-.column-force-first {
-  clear: left;
-}
-.column-force-last {
-  clear: right;
-}
-
-.column-half {
-  @extend .column;
-  width: 50%;
-  @media screen and (max-width: $breakpoint_768px) {
-    width: 100%;
-  }
-}
-.column-third {
-  @extend .column;
-  width: 33.3333333333%;
-  @media screen and (max-width: $breakpoint_768px) {
-    width: 100%;
-  }
-}
-.column-quarter {
-  @extend .column;
-  width: 25%;
-  @media screen and (max-width: $breakpoint_1200px) {
-    width: 50%;
-  }
-  @media screen and (max-width: $breakpoint_768px) {
-    width: 100%;
-  }
-}
-.column-full {
-  @extend .column;
-  width: 100%;
-  float: none;
-  clear: both;
-}
-
-.almost-full-width {
-  max-width: $breakpoint_1200px;
-  margin: 0 auto;
-}
-.full-width {
-  width: auto;
-  margin: 0;
-  clear: both;
-}
diff --git a/app/assets/stylesheets/1-utilities/_reset.scss b/app/assets/stylesheets/1-utilities/_reset.scss
deleted file mode 100644
index ed11813c..00000000
--- a/app/assets/stylesheets/1-utilities/_reset.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-/* http://meyerweb.com/eric/tools/css/reset/
-   v2.0 | 20110126
-   License: none (public domain)
-*/
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	font-size: 100%;
-	font: inherit;
-	vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-	display: block;
-}
-body {
-	line-height: 1;
-}
-ol, ul {
-	list-style: none;
-}
-blockquote, q {
-	quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-	content: '';
-	content: none;
-}
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
diff --git a/app/assets/stylesheets/1-utilities/_variables.scss b/app/assets/stylesheets/1-utilities/_variables.scss
deleted file mode 100644
index c38e678d..00000000
--- a/app/assets/stylesheets/1-utilities/_variables.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-// Colors:
-$light-green: #D9F1F1;
-$green: #57CE81;
-$orange: #FFCC00;
-$magenta: #F70A7C;
-$light_grey: #EFF7F7;
-$slogan_grey: #666;
-$medium_grey: #999;
-$dark_grey: #272727;
-$black:#000000;
-$white:#ffffff;
-$dark_magenta: darken(#F70A7C, 19%);
-
-// Measurements:
-$gutter: 30px;
-$hover_transition_time: 200ms;
-$lean_startup_process_graph_height: 642px;
-$image_isotype_height: 80px;
-$logo_width: 260px;
-$logo_height: 60px;
-$header_height: 90px;
-
-// Typography:
-$font-lato: "Lato", "Helvetica", Arial, sans-serif;
-$font-open-sans: "Open Sans", "Helvetica", Arial, sans-serif;
-$font-maven: "Maven", "Lato", "Helvetica", Arial, sans-serif;
-$font-monospace: "Menlo", "Monaco", "Consolas", "Courier New", monospace;
-$base-font-size: 17px;
-$base-line-height: 1.4;
-
-// Breakpoints:
-$breakpoint_500px: 500px;
-$breakpoint_768px: 768px;
-$breakpoint_992px: 992px;
-$breakpoint_1200px: 1200px;
-$breakpoint_1400px: 1400px;
-
-// Images:
-$image_isotype_static: "isotype.png";
-$image_isotype_animated: "isotype_vector.svg";
-$image_green_triangle: "green_triangle.png";
-$image_lean_square: "lean_square.png";
-$image_agile_circle: "agile_circle.png";
-$image_ux_triangle: "ux_triangle.png";
-$image_lean_process_old: "lean_process.png";
-$image_lean_process: "lean_startup_process_graph.svg";
-$image_circles_background_arrow: "circles_background_arrow.png";
\ No newline at end of file
diff --git a/app/assets/stylesheets/2-quarks/_code.scss b/app/assets/stylesheets/2-quarks/_code.scss
deleted file mode 100644
index db3f4adc..00000000
--- a/app/assets/stylesheets/2-quarks/_code.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-pre {
-  code {
-    overflow-x: scroll;
-    white-space: pre;
-    font-family: $font-monospace;
-  }
-}
diff --git a/app/assets/stylesheets/2-quarks/_custom_typography.scss b/app/assets/stylesheets/2-quarks/_custom_typography.scss
deleted file mode 100644
index 130b1613..00000000
--- a/app/assets/stylesheets/2-quarks/_custom_typography.scss
+++ /dev/null
@@ -1,101 +0,0 @@
-// Typography mixins:
-@mixin font-open-sans-light {
-  font-family: $font-open-sans;
-  font-weight: 300;
-}
-@mixin font-open-sans-normal {
-  font-family: $font-open-sans;
-  font-weight: 400;
-}
-@mixin font-open-sans-bold {
-  font-family: $font-open-sans;
-  font-weight: 700;
-}
-@mixin font-lato-bold {
-  font-family: $font-lato;
-  font-weight: 700;
-}
-
-@mixin font-maven {
-  font-family: $font-maven;
-  font-weight: 400;
-}
-
-// Styles:
-body {
-  @include font-open-sans-light;
-  background-color: $white;
-  color: $black;
-  font-size: 13px;
-  line-height: 18px;
-}
-h3 {
-  font-size: 2.41176470588235em; // 41px
-  letter-spacing: 1px;
-  margin: 0.5em 0;
-  @media screen and (max-width: $breakpoint_768px) {
-    font-size: 1.5em;
-  }
-  &:first-child {
-    margin-top: 0;
-  }
-}
-h4 {
-  @include font-open-sans-bold;
-  font-size: 1.5em; // 27px
-  letter-spacing: 0.04em;
-  @media screen and (max-width: $breakpoint_768px) {
-    font-size: 1.2em;
-  }
-}
-
-.values h4 {
-  text-transform: uppercase;
-}
-
-.ombulabs-brand {
-  text-transform: uppercase;
-  @include font-lato-bold;
-  font-size: 0.85em;
-}
-
-.dashboard-title {
-  text-align: left;
-  margin-top: 25px;
-  margin-bottom: 25px;
-  font-size: 35px;
-  font-weight: 300;
-  line-height: 1.2em;
-}
-
-.dashboard-title-report {
-  width: 100%;
-  background: white;
-  text-align: left;
-  font-size: 35px;
-  font-weight: 300;
-  line-height: 40px;
-  z-index: 1;
-
-  .status-badge {
-    font-size: 16px;
-  }
-}
-
-.fixed-header {
-  position: sticky;
-  top: 0px;
-  background: white;
-  z-index: 1;
-}
-
-.new-edit-title {
-  margin-top: 15px;
-  margin-bottom: 25px;
-  font-size: 1.5em;
-}
-
-.project-story-title {
-  padding: 5px;
-  font-size: 15px;
-}
diff --git a/app/assets/stylesheets/2-quarks/_icons.scss b/app/assets/stylesheets/2-quarks/_icons.scss
deleted file mode 100644
index e79a450f..00000000
--- a/app/assets/stylesheets/2-quarks/_icons.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-/* === ICONS */
-/* ========================== */
-
-.rotate {
-  transition: all 0.1s linear;
-}
-.rotate.left {
-  transform: rotate(180deg);
-}
-
-.features .fa {
-  color: #333;
-}
diff --git a/app/assets/stylesheets/2-quarks/_links.scss b/app/assets/stylesheets/2-quarks/_links.scss
deleted file mode 100644
index e5573f09..00000000
--- a/app/assets/stylesheets/2-quarks/_links.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-/* === LINKS */
-/* ========================== */
-
-a {
-	color: $dark_magenta;
-	text-decoration: none;
-	font-weight: 400;
-	&:hover{
-		text-decoration: none;
-	}
-}
diff --git a/app/assets/stylesheets/2-quarks/_typography.scss b/app/assets/stylesheets/2-quarks/_typography.scss
deleted file mode 100644
index 95e9eb4e..00000000
--- a/app/assets/stylesheets/2-quarks/_typography.scss
+++ /dev/null
@@ -1,62 +0,0 @@
-#typography ul.font-family{
-  font-size: 36px;
-  line-height: 44px;
-  width: 50%;
-  float: left;
-  margin-bottom: 30px;
-  &.italic{
-    font-style: italic;
-  }
-  li{
-    padding-bottom: 10px;
-    &.light{
-      font-weight: 300;
-    }
-    &.bold{
-      font-weight: 700;
-    }
-    &.italic{
-      font-style: italic;
-    }
-  }
-}
-.paragraph{
-  font-size: 17px;
-  line-height: 24px;
-  letter-spacing: 0.05882em;
-}
-h1, h2, h3{
-  margin: 0;
-  padding:0;
-  border: 0;
-  color: $black;
-  text-transform: none;
-  font-style: normal;
-}
-
-h1{
-  font-size: 60px;
-  font-weight: 300;
-  line-height: 1.2em;
-}
-h2{
-  font-size: 41px;
-  font-weight: 300;
-  line-height: 1.5em;
-}
-h3{
-  font-size: 14px;
-  font-weight: 700;
-  text-transform: uppercase;;
-  border: 0;
-  padding-bottom: 0;
-  margin-bottom: 0;
-  line-height: 1.2em;
-  margin-top: 20px;
-}
-.center {
-  text-align: center;
-}
-abbr{
-	text-decoration: none;
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/3-atoms/_badges.scss b/app/assets/stylesheets/3-atoms/_badges.scss
deleted file mode 100644
index 8a7ef17f..00000000
--- a/app/assets/stylesheets/3-atoms/_badges.scss
+++ /dev/null
@@ -1,51 +0,0 @@
-.status-badge {
-  display: inline-block;
-  padding: 7px 15px;
-  font-weight: 600;
-  line-height: 1;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: baseline;
-  border-radius: 20px;
-  font-size: 11px;
-
-  &.archived {
-    background-color: rgba(29, 78, 216, 0.2);
-    border-color: #1d4ed8;
-  }
-
-  &.locked {
-    background-color: rgba(255, 0, 0, 32%);
-    border-color: #d77e72;
-  }
-
-  &.version-jump {
-    background-color: #57ce81;
-  }
-}
-
-.story-status-badge {
-  display: inline-block;
-  padding: 7px 15px;
-  font-weight: 600;
-  line-height: 1;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: baseline;
-  border-radius: 20px;
-  font-size: 11px;
-  background-color: $orange;
-
-  &.approved {
-    background-color: $green;
-    border-color: #1d4ed8;
-    color: $white;
-  }
-
-  &.rejected {
-    background-color: $magenta;
-    border-color: #d77e72;
-    color: $white;
-  }
-
-}
diff --git a/app/assets/stylesheets/3-atoms/_buttons.scss b/app/assets/stylesheets/3-atoms/_buttons.scss
deleted file mode 100644
index feb1b52b..00000000
--- a/app/assets/stylesheets/3-atoms/_buttons.scss
+++ /dev/null
@@ -1,54 +0,0 @@
-.button, input.button {
-	display: inline-block;
-	text-align: center;
-	background: $orange;
-	border-radius: 20px;
-	padding: 10px 20px;
-	color: $black;
-	transition: $hover_transition_time;
-	transition-property: background, color;
-	border: none;
-  font-weight: normal;
-
-	&:hover, &:active{
-		background-color: lighten($orange, 10%);
-	}
-	&.magenta{
-		background: $magenta;
-		color: $white;
-		&:hover, &:active{
-			background-color: lighten($magenta, 10%);
-		}
-	}
-	&.green{
-		background: $green;
-		color: $white;
-		&:hover, &:active{
-			background-color: lighten($green, 10%);
-		}
-	}
-	&.red{
-		background: red;
-		color: $white;
-		&:hover, &:active{
-			background-color: lighten(red, 10%);
-		}
-	}
-	&.disabled {
-		opacity: 0.5;
-	}
-	&#bulk_delete[aria-disabled=true] {
-		opacity: 0.5;
-	}
-}
-
-#contact-us-popup .button {
-	display: block;
-	background: #fff;
-	color: $magenta;
-	margin: 20px auto 0;
-	width: 60%;
-	&:hover {
-		color: saturate($magenta, 10%);
-	}
-}
diff --git a/app/assets/stylesheets/3-atoms/_cards.scss b/app/assets/stylesheets/3-atoms/_cards.scss
deleted file mode 100644
index 4384263c..00000000
--- a/app/assets/stylesheets/3-atoms/_cards.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.project-card {
-  background-color: $white;
-  color: $black;
-  padding: 1rem;
-  border: 1px solid $orange;
-  display: block;
-  margin: 1rem 0;
-  &:hover {
-    box-shadow: 0px 0px 6px $orange;
-  }
-  &.sub:hover {
-    background-color: $orange;
-  }
-  &.sub:active {
-    background-color: #ffd633;
-  }
-}
diff --git a/app/assets/stylesheets/3-atoms/_forms.scss b/app/assets/stylesheets/3-atoms/_forms.scss
deleted file mode 100644
index ebd25152..00000000
--- a/app/assets/stylesheets/3-atoms/_forms.scss
+++ /dev/null
@@ -1,76 +0,0 @@
-label {
-  @include font-open-sans-normal;
-  margin-top: 1em;
-  margin-bottom: 0.2em;
-  display: block;
-}
-input,
-textarea,
-select {
-  display: block;
-  border: none;
-  background: #fff;
-  padding: 10px;
-  width: 100%;
-  border-radius: 2px;
-  font-size: 1em;
-  border: 1px solid $orange;
-  &:focus {
-    outline: none;
-    border: 1px solid $green;
-  }
-}
-input[type="checkbox"] {
-  display: inline;
-  width: auto;
-  margin-right: 5px;
-}
-
-.form-error {
-  background: $orange;
-  padding: 10px 20px;
-  margin-top: 2em;
-  margin-bottom: 2em;
-  border-radius: 24px;
-}
-.form-success {
-  color: #57ce81;
-  @include font-open-sans-normal;
-  font-size: 1.2em;
-  padding-top: 20px;
-}
-#error_explanation {
-  width: 450px;
-  border: 2px solid red;
-  padding: 7px 7px 0;
-  margin-bottom: 20px;
-  background-color: #f0f0f0;
-
-  h2 {
-    text-align: left;
-    font-weight: bold;
-    padding: 5px 5px 5px 15px;
-    font-size: 12px;
-    margin: -7px -7px 0;
-    background-color: #c00;
-    color: #fff;
-  }
-
-  ul li {
-    font-size: 12px;
-    list-style: square;
-  }
-}
-
-.alert-success {
-  color: black;
-  background-color: #d9f1f1;
-  border-color: #d9f1f1;
-  font-size: 12px;
-}
-
-.field,
-.select,
-.actions {
-  margin-bottom: 10px;
-}
diff --git a/app/assets/stylesheets/4-molecules/_floors.scss b/app/assets/stylesheets/4-molecules/_floors.scss
deleted file mode 100644
index 7963bd85..00000000
--- a/app/assets/stylesheets/4-molecules/_floors.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-/* === FLOORS */
-/* ========================== */
-
-.floor {
-	@extend .full-width;
-	padding-top: $gutter;    // avoid margin overflow
-	padding-bottom: $gutter; // avoid margin overflow
-	&.signin{
-		text-align: center;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		width: 100%;
-		overflow: hidden;
-		height: calc(100vh - 160px);
-		margin: -100px 0;
-	}
-}
diff --git a/app/assets/stylesheets/4-molecules/_footer.scss b/app/assets/stylesheets/4-molecules/_footer.scss
deleted file mode 100644
index 9fd0d424..00000000
--- a/app/assets/stylesheets/4-molecules/_footer.scss
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Footer */
-footer {
-  background-color: #000000;
-  height: 160px;
-  width: 100%;
-  padding-top: 30px;
-  padding-bottom: 20px;
-  color: #fff;
-  text-align: center;
-	overflow: hidden;
-	.logo-container {
-		width: 220px;
-		margin: auto;
-		.slogan {
-			font-family: "Open Sans", sans-serif;
-			font-weight: 300;
-			font-size: 9px;
-			color: #ffcc00 !important;
-			letter-spacing: 1px;
-			text-transform: uppercase;
-			margin-top: 0px;
-			float: left;
-			margin-left: 50px;
-			text-align: left;
-			text-decoration: underline;
-		}
-		.logo {
-			display: block;
-			margin: 0px auto 0px auto;
-			background-image: url(/https/github.com/assets/isotype_vector.svg);
-			background-repeat: no-repeat;
-			background-position: left center;
-			width: 220px;
-			height: 40px;
-			font-family: "Lato", "Helvetica", Arial, sans-serif;
-			font-weight: 700;
-			font-style: normal;
-			font-size: 27px;
-			letter-spacing: 2px;
-			text-transform: uppercase;
-			text-align: left;
-			padding-left: 50px;
-			background-size: auto 80%;
-			.logo-ombu {
-				color: #ec037c;
-			}
-		}
-	}
-	a{
-		color: $white;
-		&:hover, &:visited, &:link, &:active{
-			text-decoration: none;
-			color: $white;
-		}
-	}
-	.txt_footer {
-		font-family: "Lato", sans-serif;
-		color: #515151;
-		font-size: 14px;
-		font-weight: 300;
-		letter-spacing: 1px;
-		margin: 20px auto 10px auto;
-		border-top: solid 1px #515151;
-		border-bottom: solid 1px #515151;
-		padding: 10px 5px;
-		display: block;
-		width: 380px;
-		background-image: url("footer_2.png");
-		background-size: 380px 40px;
-		background-repeat: no-repeat;
-	}
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/4-molecules/_header.scss b/app/assets/stylesheets/4-molecules/_header.scss
deleted file mode 100644
index b79e247b..00000000
--- a/app/assets/stylesheets/4-molecules/_header.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Header */
-header{
-	nav{
-		text-align: right;
-		ul{
-			margin: 7.5px -15px;
-		}
-	}
-	#logo {
-		float: left;
-		margin: 17.5px -15px;
-		font-size: 2em;
-		color: #fff;
-		text-transform: uppercase;
-		font-weight: bold;
-		line-height: 1.1;
-		&:hover {
-			color: #fff;
-			text-decoration: none;
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/4-molecules/_tables.scss b/app/assets/stylesheets/4-molecules/_tables.scss
deleted file mode 100644
index 6f0b852e..00000000
--- a/app/assets/stylesheets/4-molecules/_tables.scss
+++ /dev/null
@@ -1,55 +0,0 @@
-.project-table {
-  display: grid;
-  padding: 0 0 50px;
-  &__header {
-    position: sticky;
-    background: #ffffff;
-    z-index: 1;
-    top: 54px;
-    margin-left: -20px;
-    padding-left: 20px;
-  }
-  .project-table__row {
-    display: grid;
-    grid-template-columns: 1fr 100px 70px 70px 260px;
-    align-items: center;
-    padding: 10px 0;
-    &.project-table__row--reports {
-      display: flex;
-      flex-direction: row;
-      .project-table__cell {
-        flex-grow: 1;
-        flex-shrink: 1;
-        flex-basis: 0;
-        &:first-child {
-          flex-grow: 0;
-          flex-shrink: 0;
-          flex-basis: 20%;
-        }
-      }
-    }
-    &.project-table__row--real-scores {
-      grid-template-columns: 55% repeat(3, 15%);
-    }
-    &.project-table__row--project-reports {
-      grid-template-columns: 80% 20%;
-    }
-    &.project-table__row--footer {
-      font-weight: bold;
-      margin-top: 20px;
-    }
-    &.project-table__row--header {
-      font-weight: bold;
-    }
-    &.project-table__row--story {
-      cursor: grab;
-      border-bottom: 1px solid $medium_grey;
-      &:hover {
-        background-color: #d9f1f1;
-      }
-      &:active {
-        cursor: grabbing;
-      }
-    }
-  }
-}
diff --git a/app/assets/stylesheets/action_plans.scss b/app/assets/stylesheets/action_plans.scss
deleted file mode 100644
index 09da3295..00000000
--- a/app/assets/stylesheets/action_plans.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-.action_plans-controller {
-  .btn-clipboard {
-    float: right;
-    margin-top: 10px;
-  }
-  #action-plan {
-    margin-bottom: 50px;
-  }
-  .action-plan_heading {
-    font-size: 16pt;
-    line-height: 1.2em;
-    margin: 0.2em auto;
-    text-transform: none;
-  }
-  .action-plan_heading ~ p {
-    font-size: 14pt;
-    line-height: 1.2em;
-    margin: 0.5em auto;
-  }
-}
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index a2ac5ab7..474d8eec 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -12,63 +12,12 @@
  *
  */
 
-// "bootstrap-sprockets" must be imported before "bootstrap" and "bootstrap/variables"
-@import "bootstrap-sprockets";
-@import "bootstrap";
-//  @import "bourbon";
-
-// 1-UTILITIES
-@import "1-utilities/variables";
-@import "1-utilities/reset";
-@import "1-utilities/basic";
-@import "1-utilities/grid";
-
-// 2-QUARKS
-@import "2-quarks/typography";
-@import "2-quarks/custom_typography";
-@import "2-quarks/links";
-@import "2-quarks/icons";
-@import "2-quarks/code";
-
-// 3-ATOMS
-@import "3-atoms/badges";
-@import "3-atoms/buttons";
-@import "3-atoms/forms";
-@import "3-atoms/cards";
-
-// 4-MOLECULES
-@import "4-molecules/floors";
-@import "4-molecules/header";
-@import "4-molecules/footer";
-@import "4-molecules/tables";
-
-@import "home";
-@import "project";
-@import "stories";
-@import "action_plans";
-
-body {
-  display: grid;
-  grid-template-rows: min-content 1fr;
-  height: 100vh;
-  overflow: hidden;
-
-  header.navbar {
-    margin-bottom: 0px;
-  }
-
-  header + div {
-    overflow: auto;
-    display: flex;
-    flex-direction: column;
-  }
-
-  main {
-    min-height: initial;
-    flex-grow: 1;
-  }
-
-  footer {
-    flex-shrink: 0;
-  }
-}
+ // "bootstrap-sprockets" must be imported before "bootstrap" and "bootstrap/variables"
+ @import "bootstrap-sprockets";
+ @import "bootstrap";
+
+ @import "home";
+ @import "project";
+ @import "reports";
+ @import "scaffolds";
+ @import "stories";
diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss
index 52702ff1..877a1c09 100644
--- a/app/assets/stylesheets/home.scss
+++ b/app/assets/stylesheets/home.scss
@@ -1,32 +1,151 @@
 // Place all the styles related to the Home controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+@import "bootstrap-sprockets";
+@import "bootstrap";
 
 /* Universal */
-.home-title {
-  padding: 0 15px;
-  margin-top: 20px;
-  margin-bottom: 30px;
-}
-
-.project-card.sorting {
-  position: relative;
-  &:after {
-    font-family: "FontAwesome";
-    content: "\f110";
-    display: block;
-    position: absolute;
-    top: 0.5rem;
-    right: 0.5rem;
-    animation: rotate 0.5s linear infinite;
-  }
-}
-
-@keyframes rotate {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
+
+section {
+  overflow: auto;
+}
+
+textarea {
+  resize: vertical;
+}
+
+.center {
+  text-align: center;
+}
+
+.center h1 {
+  margin-bottom: 10px;
+}
+
+.content {
+  font-family: "Open Sans", sans-serif;
+  background-color: #fdfcfc;
+  color: #272727;
+  margin: 0 0 160px;
+  min-height: 100%;
+  margin-bottom: -160px;
+}
+
+.push {
+  height: 160px;
+}
+
+.jumbotron h1{
+  font-size: 43px;
+}
+
+.alert {
+  font-size: 12px;
+}
+
+/* Header */
+
+#logo {
+  float: left;
+  margin-right: 500px;
+  margin-top: 15px;
+  font-size: 2em;
+  color: #fff;
+  text-transform: uppercase;
+  font-weight: bold;
+}
+
+#logo:hover {
+  color: #fff;
+  text-decoration: none;
+}
+
+#login {
+  font-size: 1.2em;
+  color: lightgray;
+}
+
+/* Footer */
+
+footer {
+  background-color: #000000;
+  height: 160px;
+  width: 100%;
+  padding-top: 30px;
+  padding-bottom: 20px;
+  color: #fff;
+  text-align: center;
+  overflow: hidden;
+}
+
+footer .logo-container {
+  width: 220px;
+  margin: auto;
+}
+
+.logo {
+  display: block;
+  margin: 0px auto 0px auto;
+  background-image: url(/https/github.com/assets/isotype_vector.svg);
+  background-repeat: no-repeat;
+  background-position: left center;
+  width: 220px;
+  height: 40px;
+  font-family: "Lato", "Helvetica", Arial, sans-serif;
+  font-weight: 700;
+  font-style: normal;
+  font-size: 27px;
+  letter-spacing: 2px;
+  text-transform: uppercase;
+  text-align: left;
+  padding-left: 50px;
+  background-size: auto 80%;
+}
+
+footer a:hover, a:visited, a:link, a:active {
+  text-decoration: none;
+}
+
+footer .logo a {
+  color: #fff;
+}
+
+footer .logo-container a:visited {
+  color: #fff;
+}
+
+.logo-ombu {
+  color: #ec037c;
+}
+
+.slogan {
+  font-family: "Open Sans", sans-serif;
+  font-weight: 300;
+  font-size: 9px;
+  color: #ffcc00 !important;
+  letter-spacing: 1px;
+  text-transform: uppercase;
+  margin-top: -9px;
+  float: left;
+  margin-left: 50px;
+  text-align: left;
+  text-decoration: underline;
+}
+
+
+.txt_footer {
+  font-family: "Lato", sans-serif;
+  color: #515151;
+  font-size: 14px;
+  font-weight: 300;
+  letter-spacing: 1px;
+  margin: 20px auto 10px auto;
+  border-top: solid 1px #515151;
+  border-bottom: solid 1px #515151;
+  padding: 10px 5px;
+  display: block;
+  width: 380px;
+  background-image: url("footer_2.png");
+  background-size: 380px 40px;
+  background-repeat: no-repeat;
 }
diff --git a/app/assets/stylesheets/project.scss b/app/assets/stylesheets/project.scss
index 1a128dd9..dc032c22 100644
--- a/app/assets/stylesheets/project.scss
+++ b/app/assets/stylesheets/project.scss
@@ -2,305 +2,193 @@
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
 
-.projects-controller {
-  &.index-action {
-    .btn-group {
-      display: flex;
-      justify-content: center;
-      margin-top: 20px;
-      .button {
-        margin: 0 5px;
-      }
-    }
-  }
-  &.show-action {
-    .btn-group .button_to {
-      display: inline-block;
-      .button:focus {
-        outline: 5px auto -webkit-focus-ring-color;
-        outline-offset: -2px;
-        border: none;
-      }
-    }
-  }
+// For index.html.erb
+
+.dashboard-title {
+  text-align: center;
+  margin-top: 25px;
+  margin-bottom: 25px;
+  font-size: 35px;
+  font-weight: 300;
+  line-height: 1.2em;
 }
 
-.totals {
-  font-weight: bold;
+.card-blue {
+  margin: 1.5rem;
+  background-color: #1dbbf3;
+  color: #fff;
 }
 
-#import-export {
-  margin: 0 0 50px 0;
-  summary {
-    h4 {
-      display: inline-block;
-    }
-  }
-  section {
-    background-color: $white;
-    padding: 15px;
-    margin: 5px 0 60px 0;
-    input {
-      display: inline-block;
-      margin: 0 0 10px 0;
-    }
-  }
+.project-title {
+  padding: 30px;
+  text-align: center;
+  font-size: 1.8rem;
+}
 
-  #instructions {
-    padding: 10px 0;
-    font-weight: bold;
-    ul li {
-      font-size: 12px;
-      list-style: inside;
-      font-weight: normal;
-    }
-  }
+.wrapper {
+  text-align: center;
+  margin-top: 20px;
 }
 
-.import-export-header {
-  transition: all 0.2s linear;
-  cursor: pointer;
-  outline: transparent;
+.project-title a{
+  color: white;
+}
 
-  & &__text {
-    padding-left: 1rem;
-    vertical-align: bottom;
-  }
+.project-title a:visited{
+  color: inherit;
+}
 
-  &:hover {
-    transform: translateY(-2px);
-  }
+.project-title a:hover{
+  color: inherit;
+  background-color: inherit;
+}
 
-  &::-webkit-details-marker {
-    // Remove Safari/Webkit summary marker
-    display: none;
+nav.actions a  {
+  margin: 0 20px;
+  background-color: #57CE81;
+  color: #272727;
+  border: 2px solid #57CE81;
+  padding: 10px 20px;
+  font-size: 16px;
+  line-height: 22px;
+  font-weight: 400;
+  border-radius: 20px;
+  margin-bottom: 1em;
+  margin-top: 1em;
+
+  &:hover {
+    background-color: #58ff93;
+    color: #272727;
   }
 }
 
-.card-deck {
-  -webkit-box-orient: horizontal;
-  -webkit-box-direction: normal;
-  -ms-flex-flow: row wrap;
-  flex-flow: row wrap;
-  margin-right: -15px;
-  margin-left: -15px;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  .card {
-    padding-right: 40px;
-    .card-header {
-      margin-bottom: 10px;
-    }
-  }
+// For new.html.erb and edit.html.erb
+
+.new-edit-title {
+  margin-top: 15px;
+  margin-bottom: 25px;
+  font-size: 1.5em;
 }
 
-.dropdown-wrapper {
-  display: inline-block;
-  position: relative;
+.project-story-title {
+  padding: 5px;
+  font-size: 15px;
+}
 
-  .dropdown {
-    display: none;
-    position: absolute;
-    right: 0px;
-    top: 50%;
-    z-index: 2;
-    min-width: 150px;
-    background: white;
-    box-shadow: 1px 1px 4px 2px rgba(0, 0, 0, 0.4);
+#delete {
+  background-color: #e62b2b;
+  border-color: #b50909;
+  margin: 10px 0;
+  padding: 6px 12px;
+  font-size: 14px;
+}
 
-    a span {
-      padding-left: 5px;
-    }
+#delete, a:visited {
+  color: white;
+}
 
-    a,
-    button,
-    input {
-      width: 100%;
-      border: 0px;
-      margin: 0px;
-      padding: 0.5rem;
-      background: none;
-      text-align: left;
-      font-size: 1.2rem;
-      font-weight: normal;
-      color: rgb(100, 100, 100);
+#delete:hover {
+  background-color: #b50909;
+}
 
-      &:hover,
-      &:focus-within {
-        color: black;
-      }
-    }
+// For show.html.erb
 
-    a.delete,
-    a.delete:hover {
-      color: $dark_magenta;
-    }
-  }
+.col-title {
+  font-weight: bold;
+  font-size: 15px;
+}
 
-  &:focus-within > .dropdown {
-    display: flex;
-    flex-direction: column;
-    opacity: 1;
-    pointer-events: initial;
-  }
+#edit {
+  margin: 10px 0;
+  padding: 6px 12px;
+  font-size: 14px;
 }
 
-.story_actions {
-  text-align: right;
-  .dropdown-wrapper.more-actions:before {
-    content: "|";
-    display: inline;
-  }
+#edit, a:visited {
+  color: white;
+}
 
-  .dropdown-wrapper.move-story .dropdown {
-    right: 100%;
-    top: 0px;
-  }
+#back {
+  margin: 10px 0;
+  font-size: 14px;
+  cursor: pointer;
+  color: #007bff;
 }
 
-.hierarchy {
-  position: sticky;
-  top: 0px;
-  h4 {
-    margin-bottom: 10px;
-  }
-  ul {
-    padding-left: 1.5em;
-    list-style-type: initial;
-    li {
-      padding-bottom: 0.2rem;
-      a {
-        display: inline-block;
-        vertical-align: text-top;
-      }
-    }
-  }
+#back:hover {
+  color: #007bff;
+  background-color: transparent;
 }
 
-.header {
-  display: flex;
-  h1 {
-    flex-grow: 1;
-  }
+a {
+  color: inherit;
+  background-color: inherit;
 }
 
-.dashboard-title {
-  .parent-link {
-    display: block;
-    font-size: 0.5em;
-    line-height: 1em;
-  }
-  .project-title {
-    & > button {
-      cursor: pointer;
-      display: block;
-      width: 95%;
-      background: none;
-      border: none;
-      text-align: left;
-      &:hover,
-      &:focus {
-        &:after {
-          display: inline;
-          font-family: "FontAwesome";
-          content: "\f040";
-          font-size: 0.7em;
-          vertical-align: top;
-          margin-left: 10px;
-        }
-      }
-    }
-    form {
-      display: none;
-      width: 95%;
-      input[type="text"] {
-        padding: 0;
-        border: 0;
-        background: none;
-        outline: 1px solid gray;
-      }
-      .button {
-        flex-basis: 0%;
-        font-size: 0.5em;
-        line-height: 1em;
-        margin-left: 0.2rem;
-      }
-    }
+td a:visited {
+  color: #007bff;
+  background-color: inherit;
+}
 
-    &.editing {
-      & > button {
-        display: none;
-      }
-      form {
-        display: flex;
-      }
-    }
-  }
+td a:hover {
+  color: inherit;
+  background-color: inherit;
 }
 
-.search-field {
-  position: relative;
-  padding: 0;
-  min-width: 250px;
-  margin-top: 25px;
+#wide {
+  min-width: 400px;
+}
 
-  label {
-    position: absolute;
-    margin-top: 0;
-    top: -10px;
-    left: 5px;
-    padding: 0px 3px;
-    background: white;
-    font-size: 90%;
-    color: gray;
+#import-export{
+  margin-bottom:10px;
+  section{
+    background-color:#fff;
+    padding:15px;
+    border:1px solid #ddd;
+    margin-bottom:60px;
   }
+  summary h4{display: inline-block;}
+  input[type=file]{display: inline-block; margin:10px}
 }
 
-.copy-link {
-  background: none;
-  border: none;
-  padding: 8px;
-  color: #f70a7c;
-  position: relative;
-
-  i {
-    position: relative;
-    border-radius: 50%;
-    padding-right: 5px;
+.card-deck {
+    -webkit-box-orient: horizontal;
+    -webkit-box-direction: normal;
+    -ms-flex-flow: row wrap;
+    flex-flow: row wrap;
+    margin-right: -15px;
+    margin-left: -15px;
+}
+.card-deck {
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
   }
+.card-deck .card {
+    min-width: 220px;
+}
+.card-deck .card {
+  min-height:100px;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-flex: 1;
+    -ms-flex: 1 0 0%;
+    flex: 1 0 0%;
+    -webkit-box-orient: vertical;
+    -webkit-box-direction: normal;
+    -ms-flex-direction: column;
+    flex-direction: column;
+    margin-right: 15px;
+    margin-bottom: 0;
+    margin-left: 15px;
+    justify-content: space-between;
+}
+#export .btn{
+  margin-top: 29px;
+  color: white;
 }
 
-#sub-projects-to-clone {
-  margin-bottom: 2rem;
-  .no-parent-disclaimer {
-    display: none;
-    font-weight: bold;
-  }
-  button {
-    background: none;
-    border: none;
-    cursor: pointer;
-    margin-right: 1rem;
-    margin-top: 0.2rem;
-    &:hover {
-      text-decoration: underline;
-    }
-  }
-  h4 {
-    margin-bottom: 0.5rem;
-  }
-  label {
-    margin-top: 0.2rem;
-  }
-  &.is-not-parent {
-    p,
-    button,
-    label {
-      display: none;
-    }
-    .no-parent-disclaimer {
-      display: block;
-    }
-  }
+main.container{
+  padding-top: 100px;
 }
diff --git a/app/assets/stylesheets/reports.scss b/app/assets/stylesheets/reports.scss
new file mode 100644
index 00000000..269c20e3
--- /dev/null
+++ b/app/assets/stylesheets/reports.scss
@@ -0,0 +1,11 @@
+// Place all the styles related to the Reports controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
+
+.totals {
+  font-weight: bold;
+}
+
+.col-title {
+  width: 130px;
+}
diff --git a/app/assets/stylesheets/scaffolds.scss b/app/assets/stylesheets/scaffolds.scss
new file mode 100644
index 00000000..60451880
--- /dev/null
+++ b/app/assets/stylesheets/scaffolds.scss
@@ -0,0 +1,84 @@
+body {
+  background-color: #fff;
+  color: #333;
+  margin: 33px;
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+}
+
+p, ol, ul, td {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+a {
+  color: #000;
+
+  &:visited {
+    color: #666;
+  }
+
+  &:hover {
+    color: #fff;
+    background-color: #000;
+  }
+}
+
+th {
+  padding-bottom: 5px;
+}
+
+td {
+  padding: 0 5px 7px;
+}
+
+div {
+  &.field, &.actions {
+    margin-bottom: 10px;
+  }
+}
+
+#notice {
+  color: green;
+}
+
+.field_with_errors {
+  padding: 2px;
+  background-color: red;
+  display: table;
+}
+
+#error_explanation {
+  width: 450px;
+  border: 2px solid red;
+  padding: 7px 7px 0;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+
+  h2 {
+    text-align: left;
+    font-weight: bold;
+    padding: 5px 5px 5px 15px;
+    font-size: 12px;
+    margin: -7px -7px 0;
+    background-color: #c00;
+    color: #fff;
+  }
+
+  ul li {
+    font-size: 12px;
+    list-style: square;
+  }
+}
+
+label {
+  display: block;
+}
diff --git a/app/assets/stylesheets/stories.scss b/app/assets/stylesheets/stories.scss
index 3ace7f06..97071b4c 100644
--- a/app/assets/stylesheets/stories.scss
+++ b/app/assets/stylesheets/stories.scss
@@ -1,178 +1,60 @@
-.project_id {
-  padding: 5px;
-  font-size: 15px;
-}
-.stories-controller.show-action h1 {
-  margin-top: 0.5em;
-}
-
-.word-break {
-  word-break: break-all;
-}
-
-.story-description,
-.extra-info,
-.story_preview {
-  margin-bottom: 25px;
-  font-size: 15px;
-  p {
-    margin-top: 1em;
-  }
-  em {
-    font-style: italic;
-  }
-
-  strong {
-    font-weight: bold;
-  }
+.stories-controller {
+  form {
+    input, textarea {
+      width: 90%;
+    }
 
-  ul {
-    padding-top: 1em;
-    padding-bottom: 1em;
-    list-style-position: inside;
-    list-style-type: circle;
+    input[type=submit] {
+      width: auto;
+    }
   }
 }
 
-#first {
-  margin-right: 25px;
-}
-
-.estimate {
+.project_id {
   padding: 5px;
-  width: 200px;
-}
-
-.checkbox input[type="checkbox"] {
-  width: 15px;
-}
-
-.modal .story-description h1 {
-  font-size: 1.5rem;
-  margin-bottom: 0.5rem;
-}
-
-.modal .story-description p {
-  overflow: auto;
-  margin-bottom: 1.5em;
+  font-size: 15px;
 }
 
-.modal p {
-  padding-bottom: 1.3em;
+label {
+  margin-top: 20px;
+  font-weight: 600;
+  margin-bottom: 10px;
+  margin-right: 10px;
+  font-size: 14px;
+  display: block !important
 }
 
-.modal strong {
-  font-weight: bold;
+.description {
+  text-align: center;
+  margin-top: 5px;
+  margin-bottom: 5px;
+  font-size: 15px;
+  color: #6b6767
 }
 
-.new_story,
-.edit_story {
-  display: grid;
-  grid-template-areas:
-    "error error"
-    "title preview"
-    "description preview"
-    "extra extra-preview"
-    "status ."
-    "submit .";
-  grid-template-columns: repeat(2, minmax(50%, 1fr));
-  grid-column-gap: 10px;
-
-  #error_explanation {
-    grid-area: error;
-  }
+// For show.html.erb
 
-  .field {
-    align-self: start;
-
-    &.story_title {
-      grid-area: title;
-    }
-
-    &.story_description {
-      grid-area: description;
-    }
-
-    &.story_extra_info {
-      grid-area: extra;
-    }
-
-    &.story_status {
-      grid-area: status;
-    }
-  }
-
-  .story_preview {
-    grid-area: preview;
-  }
-
-  .extra_info_preview {
-    grid-area: extra-preview;
-  }
-
-  .extra_info_preview .content,
-  .story_preview .content {
-    overflow: auto;
-    max-height: min(50vh, 700px);
-    // prevent long links from overflowing
-    a {
-      word-break: break-all;
-    }
-  }
-
-  .btn-group {
-    justify-self: start;
-    grid-area: submit;
-  }
+.story-title {
+  margin-top: 115px;
+  margin-bottom: 25px;
+  font-size: 2em;
 }
 
-.popup {
-  display: none;
-  position: absolute;
-  right: 30px;
-  z-index: 50;
-  background: #d9f1f1;
-  height: 30px;
-  width: 140px;
-  border: 1px solid #9b054d;
+.story-description {
+  margin-bottom: 25px;
   padding: 5px;
+  font-size: 15px;
 }
 
-.story-title {
+.estimate_wrapper {
   display: flex;
-  align-items: center;
-  gap: 1rem;
-}
-
-.comments-section {
-  margin: 16px 0;
-
-  .comment-card {
-    margin: 8px 0;
-
-    .bold {
-      font-weight: bold;
-    }
-
-    .link-blue {
-      color: blue;
-    }
-  }
 }
 
-.comment-form-container {
-  margin: 8px 0;
-  width: 50%;
-
-  .bold {
-    font-weight: bold;
-  }
-}
-
-#comment_body {
-  margin: 10px 0;
+#first {
+  margin-right: 25px;
 }
 
-input.button.green {
-  width: auto;
+.estimate {
+  padding: 5px;
+  width: 200px;
 }
diff --git a/app/controllers/action_plans_controller.rb b/app/controllers/action_plans_controller.rb
deleted file mode 100644
index 9c1baf32..00000000
--- a/app/controllers/action_plans_controller.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class ActionPlansController < ApplicationController
-  before_action :authenticate_user!
-
-  def show
-    @project = Project.find(params[:project_id])
-    @project_stories = @project.stories.approved.by_position
-    @children = Project.sub_projects_with_approved_and_ordered_stories(@project.id)
-  end
-end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9b5fc82b..a846351f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,8 +1,5 @@
 class ApplicationController < ActionController::Base
-  include Pundit::Authorization
   protect_from_forgery with: :exception
-  before_action :toggle_rack_mini_profiler
-  rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
   def hello
     render html: "hello, world!"
@@ -12,33 +9,4 @@ def after_sign_in_path_for(resource)
     projects_path
   end
 
-  private
-
-  # we can enable this for everybody, it's hidden by default
-  def toggle_rack_mini_profiler
-    show =
-      if params.key?(:enable_rack_mini_profiler)
-        cookies[:rack_mini_profiler] = "show"
-        true
-      elsif params.key?(:disable_rack_mini_profiler)
-        cookies.delete(:rack_mini_profiler)
-        false
-      end
-
-    if show || cookies[:rack_mini_profiler]
-      Rack::MiniProfiler.authorize_request
-    end
-  end
-
-  def user_not_authorized
-    flash[:error] = "You are not authorized to perform this action."
-    redirect_back(fallback_location: root_path)
-  end
-
-  def ensure_unarchived!
-    if @project.archived? || @project.parent&.archived?
-      flash[:error] = "You can't perform this action on an archived project."
-      redirect_to project_path(@project.id)
-    end
-  end
 end
diff --git a/app/controllers/callbacks_controller.rb b/app/controllers/callbacks_controller.rb
new file mode 100644
index 00000000..958f45b2
--- /dev/null
+++ b/app/controllers/callbacks_controller.rb
@@ -0,0 +1,19 @@
+require 'open-uri'
+
+class CallbacksController < Devise::OmniauthCallbacksController
+  def github
+    username = request.env["omniauth.auth"]['extra']['raw_info']['login']
+
+    ombulabs_members_json = open('https://api.github.com/orgs/ombulabs/members').read
+    ombulabs_members_parsed = JSON.parse(ombulabs_members_json)
+    ombulabs_members = ombulabs_members_parsed.map { |member| member["login"] }
+
+    if username.in?(ombulabs_members)
+      @user = User.from_omniauth(request.env["omniauth.auth"])
+      sign_in_and_redirect @user
+    else
+      flash[:error] = "This application is only available to members of Ombu Labs."
+      redirect_to new_user_session_path
+    end
+  end
+end
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
deleted file mode 100644
index 41ed8892..00000000
--- a/app/controllers/comments_controller.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-class CommentsController < ApplicationController
-  before_action :authenticate_user!
-  before_action :load_story_and_project
-  before_action :find_comment, only: [:edit, :update, :destroy]
-
-  def edit
-  end
-
-  def create
-    @comment = current_user.comments.build(story: @story)
-    @comment.attributes = comment_params
-    saved = @comment.save
-    if saved
-      flash[:success] = "Comment created!"
-    else
-      flash[:error] = @comment.errors.full_messages
-    end
-
-    redirect_to project_story_path(@comment.story.project_id, @comment.story_id)
-  end
-
-  def update
-    updated = @comment.update(comment_params)
-    if updated
-      flash[:success] = "Comment updated!"
-      redirect_to project_story_path(@comment.story.project_id, @comment.story_id)
-    else
-      flash[:error] = @comment.errors.full_messages
-      render :edit
-    end
-  end
-
-  def destroy
-    @comment.destroy
-    flash[:success] = "Comment deleted!"
-    redirect_to project_story_path(@comment.story.project_id, @comment.story_id)
-  end
-
-  private
-
-  def find_comment
-    @comment = current_user.comments.where(story_id: params[:story_id]).find(params[:id])
-  rescue ActiveRecord::RecordNotFound
-    flash[:error] = "Comment not found"
-    redirect_to project_story_path(params[:project_id], params[:story_id])
-  end
-
-  def load_story_and_project
-    @project = Project.find(params[:project_id])
-    @story = Story.find(params[:story_id])
-  rescue ActiveRecord::RecordNotFound
-    flash[:error] = "Project or Story not found"
-    redirect_to projects_path
-  end
-
-  def comment_params
-    params.require(:comment).permit(:body)
-  end
-end
diff --git a/app/controllers/estimates_controller.rb b/app/controllers/estimates_controller.rb
index 8a34c38b..5ba05a61 100644
--- a/app/controllers/estimates_controller.rb
+++ b/app/controllers/estimates_controller.rb
@@ -8,66 +8,54 @@ def new
   end
 
   def edit
+    @estimate = Estimate.find(params[:id])
   end
 
   def create
-    @estimate = @story.estimate_for(current_user) || current_user.estimates.build(story: @story)
-    @estimate.attributes = estimate_params
-
-    saved = @estimate.save
-    respond_to do |format|
-      format.html do
-        if saved
-          flash[:success] = "Estimate created!"
-          redirect_to project_path(@project.id)
-        else
-          flash[:error] = @estimate.errors.full_messages
-          render :new
-        end
-      end
-      format.js
+    params["estimate"]["user_id"] = current_user.id
+    @estimate = Estimate.new(estimate_params)
+
+    if @estimate.save
+      flash[:success] = "Estimate created!"
+      redirect_to project_path(@project.id)
+    else
+      flash[:error] = @estimate.errors.full_messages
+      render :new
     end
   end
 
   def update
-    updated = @estimate.update(estimate_params)
-    respond_to do |format|
-      format.html do
-        if updated
-          flash[:success] = "Estimate updated!"
-          redirect_to project_path(@project.id)
-        else
-          flash[:error] = @estimate.errors.full_messages
-          render :edit
-        end
-      end
-      format.js
+    @estimate = Estimate.find(params[:id])
+    params["estimate"]["user_id"] = current_user.id
+    if @estimate.update_attributes(estimate_params)
+      flash[:success] = "Estimate updated!"
+      redirect_to project_path(@project.id)
+    else
+      flash[:error] = @estimate.errors.full_messages
+      render :edit
     end
   end
 
   def destroy
     @estimate.destroy
     respond_to do |format|
-      format.html { redirect_to project_path(@project), notice: "Estimate was successfully destroyed." }
+      format.html { redirect_to project_path(@project), notice: 'Estimate was successfully destroyed.' }
       format.json { head :no_content }
     end
   end
 
   private
 
-  def load_story_and_project
-    @project = Project.find(params[:project_id])
-    @story = Story.find(params[:story_id])
-  end
+    def load_story_and_project
+      @project = Project.find(params[:project_id])
+      @story = Story.find(params[:story_id])
+    end
 
-  def find_estimate
-    @estimate = current_user.estimates.where(story_id: params[:story_id]).find(params[:id])
-  rescue ActiveRecord::RecordNotFound
-    flash[:error] = "Estimate not found"
-    redirect_to project_path(params[:project_id])
-  end
+    def find_estimate
+      @estimate = Estimate.find(params[:id])
+    end
 
-  def estimate_params
-    params.require(:estimate).permit(:best_case_points, :worst_case_points)
-  end
+    def estimate_params
+      params.require(:estimate).permit(:best_case_points, :worst_case_points, :user_id, :story_id)
+    end
 end
diff --git a/app/controllers/madmin/application_controller.rb b/app/controllers/madmin/application_controller.rb
deleted file mode 100644
index 12ace7d4..00000000
--- a/app/controllers/madmin/application_controller.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module Madmin
-  class ApplicationController < Madmin::BaseController
-    include Pundit::Authorization
-    before_action :ensure_admin
-
-    def ensure_admin
-      redirect_to "/" if current_user.nil? || !current_user.admin
-    end
-  end
-end
diff --git a/app/controllers/madmin/estimates_controller.rb b/app/controllers/madmin/estimates_controller.rb
deleted file mode 100644
index 15e49bac..00000000
--- a/app/controllers/madmin/estimates_controller.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-module Madmin
-  class EstimatesController < Madmin::ResourceController
-  end
-end
diff --git a/app/controllers/madmin/projects_controller.rb b/app/controllers/madmin/projects_controller.rb
deleted file mode 100644
index 7547e930..00000000
--- a/app/controllers/madmin/projects_controller.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-module Madmin
-  class ProjectsController < Madmin::ResourceController
-  end
-end
diff --git a/app/controllers/madmin/stories_controller.rb b/app/controllers/madmin/stories_controller.rb
deleted file mode 100644
index 20651828..00000000
--- a/app/controllers/madmin/stories_controller.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-module Madmin
-  class StoriesController < Madmin::ResourceController
-  end
-end
diff --git a/app/controllers/madmin/users_controller.rb b/app/controllers/madmin/users_controller.rb
deleted file mode 100644
index 323ea7e0..00000000
--- a/app/controllers/madmin/users_controller.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-module Madmin
-  class UsersController < Madmin::ResourceController
-  end
-end
diff --git a/app/controllers/madmin/version_jumps_controller.rb b/app/controllers/madmin/version_jumps_controller.rb
deleted file mode 100644
index 986de88f..00000000
--- a/app/controllers/madmin/version_jumps_controller.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-module Madmin
-  class VersionJumpsController < Madmin::ResourceController
-  end
-end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index b9c352bd..5d24983d 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -1,11 +1,8 @@
 class ProjectsController < ApplicationController
   before_action :authenticate_user!
-  before_action :find_project, only: [:show, :edit, :update, :sort, :sort_stories, :destroy, :new_sub_project, :toggle_archive, :toggle_locked, :open_delete_modal]
-  before_action :ensure_unarchived!, only: [:edit, :new_sub_project, :update]
 
   def index
-    status = (params[:archived] == "true") ? "archived" : nil
-    @projects = Project.where(parent_id: nil, status: status)
+    @projects = Project.all
   end
 
   def new
@@ -13,125 +10,56 @@ def new
   end
 
   def edit
+    @project = Project.find(params[:id])
   end
 
   def sort
-    params[:project].each_with_index do |id, index|
-      @project.projects.where(id: id).update_all(position: index + 1)
-    end
-    head :ok
-  end
-
-  def sort_stories
     params[:story].each_with_index do |id, index|
-      @project.stories.where(id: id).update_all(position: index + 1)
+      Story.where(id: id).update_all(position: index + 1)
     end
-    head :ok
-  end
-
-  def toggle_archive
-    @project.toggle_archived!
-  end
 
-  # PATCH /projects/1/toggle_locked.js
-  def toggle_locked
-    if @project.locked_at.nil?
-      @project.update(locked_at: Time.current)
-    else
-      @project.update(locked_at: nil)
-    end
-  end
-
-  def new_clone
-    @original = Project.includes(:projects, :version_jump, stories: :estimates).find(params[:id])
-  end
-
-  def clone
-    original = Project.includes(stories: :estimates).find(params[:id])
-    clone = Project.create(clone_params)
-    original.clone_stories_into(clone)
-    if clone.parent.nil? && original.projects
-      original.clone_projects_into(clone, only: params[:sub_project_ids])
-    end
-
-    flash[:success] = "Project cloned!"
-    redirect_to "/projects/#{clone.id}"
+    head :ok
   end
 
   def create
     @project = Project.new(projects_params)
     if @project.save
       flash[:success] = "Project created!"
-      redirect_to project_path(parent_id)
+      redirect_to "/projects"
     else
-      flash.now[:error] = @project.errors.full_messages
-      render :new
+      flash[:error] = @project.errors.full_messages
+      render 'projects/new'
     end
   end
 
   def destroy
+    @project = Project.find(params[:id])
+    @project.destroy
     respond_to do |format|
-      if @project.title.strip.eql?(params.dig(:project, :title)&.strip)
-        @project.destroy
-        flash[:success] = "Project was successfully destroyed."
-      else
-        flash[:error] = "Make sure you added the correct project's title"
-      end
-      format.html { redirect_to projects_path }
+      format.html { redirect_to projects_path, notice: 'Project was successfully destroyed.' }
     end
   end
 
   def show
-    @sidebar_projects = @project.parent ? @project.parent.projects : @project.projects
-    @stories = @project.stories.by_position.includes(:estimates)
-    @siblings = @project.siblings
+    @project = Project.find(params[:id])
+    @stories = Story.where(project_id: @project.id).order(:position)
   end
 
   def update
-    authorize(@project)
-    if @project.update(projects_params)
-      respond_to do |format|
-        format.html do
-          flash[:success] = "Project updated!"
-          redirect_to project_path(@project.id)
-        end
-        format.js do
-          @sidebar_projects = @project.parent ? @project.parent.projects : @project.projects
-        end
-      end
+    @project = Project.find(params[:id])
+    if @project.update_attributes(projects_params)
+      flash[:success] = "Project updated!"
+      redirect_to project_path(@project.id)
     else
       flash[:error] = @project.errors.full_messages
       render :edit
     end
   end
 
-  def new_sub_project
-    @sub = Project.new(parent_id: @project)
-  end
-
-  # GET /projects/1/open_delete_modal.js
-  def open_delete_modal
-  end
-
   private
 
-  def find_project
-    @project = Project.find(params[:id] || params[:project_id])
-  end
-
   def projects_params
-    params.require(:project).permit(:title, :status, :parent_id, :version_jump_id)
-  end
-
-  def clone_params
-    params.require(:project).permit(:title, :parent_id, :version_jump_id)
+    params.require(:project).permit(:title, :status)
   end
 
-  def parent_id
-    if @project.parent_id.nil?
-      @project.id
-    else
-      @project.parent_id
-    end
-  end
 end
diff --git a/app/controllers/real_scores_controller.rb b/app/controllers/real_scores_controller.rb
index 49828337..ea981819 100644
--- a/app/controllers/real_scores_controller.rb
+++ b/app/controllers/real_scores_controller.rb
@@ -3,21 +3,26 @@ class RealScoresController < ApplicationController
   before_action :find_project
 
   def edit
-    @stories = @project.stories.by_position
+    @stories = @project.stories
   end
 
   def update
-    values = params[:stories].to_unsafe_hash.transform_keys { |k| k.gsub("story_", "") }
-    values.each do |id, score|
-      @project.stories.find { |story| story.id == id.to_i }.update(real_score: score)
+    values = params[:stories].to_unsafe_hash.transform_keys{|k| k.gsub("story_", '')}
+    values.each do |id,score|
+      @project.stories.find{|story| story.id == id.to_i}.update(real_score: score)
     end
 
-    redirect_to [@project, :report], flash: {success: "Real scores populated"}
+    redirect_to [@project, :report], flash: {success: "Real scores populated"} 
   end
 
-  private
+private
 
   def find_project
     @project = Project.find(params[:project_id])
   end
+
+  def stories_params
+    params.require(:story).permit(:title, :description, :project_id)
+  end
+
 end
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
new file mode 100644
index 00000000..9c253888
--- /dev/null
+++ b/app/controllers/registrations_controller.rb
@@ -0,0 +1,12 @@
+class RegistrationsController < Devise::RegistrationsController
+
+  private
+
+  def sign_up_params
+    params.require(:user).permit(:name, :email, :password, :password_confirmation)
+  end
+
+  def account_update_params
+    params.require(:user).permit(:name, :email, :password, :password_confirmation, :current_password)
+  end
+end
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index f7ecd2d7..5694d864 100644
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -1,4 +1,5 @@
 class ReportsController < ApplicationController
+
   before_action :ensure_admin
   before_action :project, only: [:show]
 
@@ -7,26 +8,9 @@ def index
   end
 
   def show
-    respond_to do |format|
-      format.html do
-        @stories = @project.stories.by_position.includes(:estimates)
-        @estimates = @project.estimates
-        @users = @project.users.uniq
-        @real_score_exists = @stories.pluck(:real_score).any?
-        @can_generate_estimate_report = @stories.any? && stories_have_minimum_estimates?
-      end
-
-      format.csv do
-        report = Report.new(@project)
-        render plain: report.to_csv
-      end
-    end
-  end
-
-  private
-
-  def stories_have_minimum_estimates?
-    @stories.all? { |story| story.estimates_count >= Report::MINIMUM_ESTIMATES_PER_STORY }
+    @stories = @project.stories
+    @estimates = @project.estimates
+    @users = @project.users.uniq
   end
 
   def ensure_admin
diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb
index 768aa26d..d3bb5cb9 100644
--- a/app/controllers/stories_controller.rb
+++ b/app/controllers/stories_controller.rb
@@ -1,14 +1,10 @@
-require "csv"
+require 'csv'
 class StoriesController < ApplicationController
   before_action :authenticate_user!
-  before_action :find_project, except: [:bulk_destroy, :render_markdown, :edit, :update, :destroy, :show, :move, :approve, :reject, :pending]
-  before_action :find_story, only: [:edit, :update, :destroy, :show, :move, :approve, :reject, :pending]
-  before_action :validate_url_product_id, only: [:edit, :update, :destroy, :show, :move]
-  before_action :ensure_unarchived!, except: [:show, :bulk_destroy, :render_markdown, :move]
+  before_action :find_project, except: :bulk_destroy
+  before_action :find_story, only: [:edit, :update, :destroy, :show]
 
-  include ApplicationHelper
-
-  CSV_HEADERS = %w[id title description position]
+  CSV_HEADERS = %w{id title description position}
 
   def new
     @story = Story.where(id: params[:story_id]).first_or_initialize.dup
@@ -25,6 +21,7 @@ def create
       flash[:success] = "Story created!"
       redirect_to project_path(@project.id)
     else
+      flash[:error] = @story.errors.full_messages
       render :new
     end
   end
@@ -32,7 +29,7 @@ def create
   def destroy
     @story.destroy
     respond_to do |format|
-      format.html { redirect_to project_path(@project), notice: "Story was successfully destroyed." }
+      format.html { redirect_to project_path(@project), notice: 'Story was successfully destroyed.' }
       format.json { head :no_content }
     end
   end
@@ -45,13 +42,11 @@ def bulk_destroy
   end
 
   def show
-    @estimate = Estimate.find_by(story: @story, user: current_user)
-    @comments = @story.comments.includes(:user).order(:created_at)
-    @comment = Comment.new
+    @estimate = Estimate.where(story: @story, user: current_user).first
   end
 
   def update
-    if @story.update(stories_params)
+    if @story.update_attributes(stories_params)
       flash[:success] = "Story updated!"
       redirect_to project_path(@project.id)
     else
@@ -61,25 +56,22 @@ def update
   end
 
   def import
+
     if !params[:file].original_filename.ends_with?(".csv")
       flash[:error] = "Invalid File: Must be CSV"
-      redirect_to(@project) && return
-    end
-    file = begin
-      CSV.parse(params[:file].read, headers: true)
-    rescue
-      []
+      redirect_to(@project) and return
     end
+    file = CSV.parse(params[:file].read, headers: true) rescue []
     if file.empty?
       flash[:error] = "CSV Error: File is empty or could not be parsed"
-      redirect_to(@project) && return
+      redirect_to(@project) and return
     elsif !expected_csv_headers?(file)
       flash[:error] = "Invalid CSV: Must have headers title,description,position"
-      redirect_to(@project) && return
+      redirect_to(@project) and return
     else
       file.each do |story_csv|
-        story = @project.stories.find_by(id: story_csv["id"]) || @project.stories.new
-        story.update(title: story_csv["title"], description: story_csv["description"], position: story_csv["position"])
+        story = @project.stories.where(id: story_csv['id']).first || @project.stories.new
+        story.update(title: story_csv['title'], description: story_csv['description'], position: story_csv['position'])
       end
       flash[:success] = "CSV import was successful"
       redirect_to project_path(@project)
@@ -87,87 +79,33 @@ def import
   end
 
   def export
-    csv = if params[:export_with_comments] == "1"
-      CSV.generate(headers: true) do |csv|
-        csv << CSV_HEADERS + ["comment"]
-        @project.stories.includes(:comments).approved.by_position.each do |story|
-          comments = []
-          story.comments.each do |comment|
-            comments << "#{display_name(comment.user)}: #{comment.body}"
-          end
-          csv << [story.id, story.title, story.description, story.position] + comments
-        end
-      end
-    else
-      CSV.generate(headers: true) do |csv|
-        csv << CSV_HEADERS
-        @project.stories.approved.by_position.each do |story|
-          csv << story.attributes.slice(*CSV_HEADERS)
-        end
+    csv = CSV.generate(headers: true) do |csv|
+      csv << CSV_HEADERS
+      @project.stories.each do |story|
+        csv << story.attributes.slice(*CSV_HEADERS)
       end
     end
-    filename = "#{@project.title.gsub(/[^\w]/, "_")}-#{Time.now.to_formatted_s(:short).tr(" ", "_")}.csv"
+    filename = "#{@project.title.gsub(/[^\w]/, '_')}-#{Time.now.to_s(:short).gsub(" ", '_')}.csv"
     send_data csv, filename: filename
   end
 
-  def render_markdown
-    render plain: markdown(params[:markdown])
-  end
-
-  def move
-    @new_project = @project.siblings.find_by(id: params[:to_project])
-
-    if @new_project
-      @story.update_attribute(:project_id, @new_project.id)
-      flash[:success] = "Story moved!"
-    else
-      flash[:error] = "Selected project does not exist or is not a sibling."
-    end
-
-    redirect_to @project
-  end
-
-  def approve
-    @story.approved!
-    respond_to do |format|
-      format.js { render "shared/update_status" }
-    end
-  end
-
-  def reject
-    @story.rejected!
-    respond_to do |format|
-      format.js { render "shared/update_status" }
-    end
-  end
 
-  def pending
-    @story.pending!
-    respond_to do |format|
-      format.js { render "shared/update_status" }
-    end
-  end
-
-  private
+private
 
   def find_project
     @project = Project.find(params[:project_id])
   end
 
   def find_story
-    @story = Story.find(params[:id] || params[:story_id])
-    @project = @story.project
-  end
-
-  def validate_url_product_id
-    raise ActionController::RoutingError.new("This story was not found for this project") unless params[:project_id] == @project.id.to_s
+    @story = Story.find(params[:id])
   end
 
   def stories_params
-    params.require(:story).permit(:title, :description, :extra_info, :project_id, :status)
+    params.require(:story).permit(:title, :description, :project_id)
   end
 
   def expected_csv_headers?(file)
-    ["title", "description", "position"].to_set.subset?(file.headers.to_set)
+    ['title', 'description', 'position'].to_set.subset?(file.headers.to_set)
   end
+
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6770a24e..1a7bc249 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,40 +1,24 @@
 module ApplicationHelper
+
   OPTIONS = {
-    hard_wrap: true,
-    link_attributes: {rel: "nofollow", target: "_blank"},
-    no_intra_emphasis: true,
-    escape_html: true
+    filter_html:     true,
+    hard_wrap:       true,
+    link_attributes: { rel: 'nofollow', target: "_blank" },
+    fenced_code_blocks: true,
+    no_intra_emphasis:  true,
   }.freeze
 
   EXTENSIONS = {
-    autolink: true,
-    superscript: true
+    autolink:           true,
+    superscript:        true,
   }.freeze
 
-  def page_title_tag
-    page_title = ""
-    page_title += "#{@project&.parent&.title} - " if @project&.parent&.present?
-    page_title += "#{@project.title} - " if @project&.title&.present?
-    page_title += "Points"
-    page_title
-  end
-
-  def header_link
-    @project.presence || "/projects"
-  end
-
-  def header_title
-    @project&.breadcrumb || "points app"
-  end
-
   def markdown(text)
+
     renderer = Redcarpet::Render::HTML.new(OPTIONS)
     markdown = Redcarpet::Markdown.new(renderer, EXTENSIONS)
 
-    markdown.render(text.to_s).html_safe
+    markdown.render(text).html_safe
   end
 
-  def display_name(user)
-    user.name || user.email
-  end
 end
diff --git a/app/helpers/estimates_helper.rb b/app/helpers/estimates_helper.rb
index 85b17041..58b133ba 100644
--- a/app/helpers/estimates_helper.rb
+++ b/app/helpers/estimates_helper.rb
@@ -1,5 +1,5 @@
 module EstimatesHelper
-  ESTIMATES = [[0, 0], [1, 1], [2, 2], [3, 3], [5, 5], [8, 8], [13, 13], [21, 21]]
+  ESTIMATES = [[0, 0], [1, 1], [2, 2], [3, 3], [5, 5], [8, 8], [13, 13], [21, 21], [34, 34], [55, 55]]
 
   def fib_numbers
     ESTIMATES
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 7d60ec97..3722ffa9 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -1,34 +1,8 @@
 module ProjectsHelper
+
   def estimated(story)
-    @estimate_id = story.estimate_for(current_user)
+    @estimate_id = story.estimates.where(user_id: current_user.id).first
     @estimate_id.present?
   end
 
-  def is_unlocked?(model)
-    policy(model).update?
-  end
-
-  def link_unless_archived(project, text, url, classes: nil, method: :get, remote: false, icon: nil, data_attr: nil, id: nil)
-    link_text = text_content(icon, text)
-    if project.archived? || project.parent&.archived?
-      button_tag(link_text, disabled: true, class: "button #{classes} disabled", aria: {disabled: true})
-    else
-      link_to(link_text, url, class: "button #{classes}", title: text, method: method, remote: remote, data: data_attr, id: id)
-    end
-  end
-
-  def version_jump_badge(project)
-    return "" unless project.version_jump
-
-    jump = project.version_jump
-    content_tag(:span, jump.to_label, class: "status-badge version-jump")
-  end
-
-  private
-
-  def text_content(icon, text)
-    return text if icon.nil?
-
-    content_tag(:i, "", class: "fa fa-#{icon}").concat(content_tag(:span, text))
-  end
 end
diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb
index 1c4cd30f..2788910b 100644
--- a/app/helpers/reports_helper.rb
+++ b/app/helpers/reports_helper.rb
@@ -1,4 +1,5 @@
 module ReportsHelper
+
   def best_estimate_for_story(story)
     if story.estimates.length < 2
       "Not enough estimates"
@@ -16,10 +17,11 @@ def worst_estimate_for_story(story)
   end
 
   def user_estimate(story, user, estimate_type)
-    estimate = story.estimate_for(user)
+    estimate = story.estimates.where(user_id: user.id).first
 
     return "-" if estimate.nil?
 
-    (estimate_type == "best") ? estimate.best_case_points : estimate.worst_case_points
+    estimate_type == 'best' ? estimate.best_case_points : estimate.worst_case_points
   end
+
 end
diff --git a/app/helpers/stories_helper.rb b/app/helpers/stories_helper.rb
index 126f0ba8..43e5cd8f 100644
--- a/app/helpers/stories_helper.rb
+++ b/app/helpers/stories_helper.rb
@@ -1,18 +1,2 @@
 module StoriesHelper
-  def status_label(story)
-    "<span class='story-status-badge #{story.status}'>#{story.status}</span>".html_safe
-  end
-
-  def status_color(story)
-    return "green" if @story.approved?
-    return "magenta" if @story.rejected?
-
-    "orange"
-  end
-
-  def options_for_status_select(story, action)
-    return options_for_select({"Pending" => "pending", "Approved" => "approved"}, selected: story.status) if action == "new"
-
-    options_for_select({"Pending" => "pending", "Approved" => "approved", "Rejected" => "rejected"}, selected: story.status)
-  end
 end
diff --git a/app/madmin/resources/estimate_resource.rb b/app/madmin/resources/estimate_resource.rb
deleted file mode 100644
index 15ab46d2..00000000
--- a/app/madmin/resources/estimate_resource.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-class EstimateResource < Madmin::Resource
-  # Attributes
-  attribute :id, form: false
-  attribute :best_case_points
-  attribute :worst_case_points
-
-  # Associations
-  attribute :story
-  attribute :user
-
-  # Uncomment this to customize the display name of records in the admin area.
-  # def self.display_name(record)
-  #   record.name
-  # end
-
-  # Uncomment this to customize the default sort column and direction.
-  # def self.default_sort_column
-  #   "created_at"
-  # end
-  #
-  # def self.default_sort_direction
-  #   "desc"
-  # end
-end
diff --git a/app/madmin/resources/project_resource.rb b/app/madmin/resources/project_resource.rb
deleted file mode 100644
index 750bb2ce..00000000
--- a/app/madmin/resources/project_resource.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-class ProjectResource < Madmin::Resource
-  # Attributes
-  attribute :id, form: false
-  attribute :title
-  attribute :status
-
-  # Associations
-  attribute :stories
-  attribute :estimates
-  attribute :users
-  attribute :parent
-  attribute :projects
-  attribute :version_jump
-
-  def self.display_name(record)
-    record.title.truncate(20)
-  end
-
-  # Uncomment this to customize the default sort column and direction.
-  # def self.default_sort_column
-  #   "created_at"
-  # end
-  #
-  # def self.default_sort_direction
-  #   "desc"
-  # end
-end
diff --git a/app/madmin/resources/story_resource.rb b/app/madmin/resources/story_resource.rb
deleted file mode 100644
index 1926fd52..00000000
--- a/app/madmin/resources/story_resource.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-class StoryResource < Madmin::Resource
-  # Attributes
-  attribute :id, form: false
-  attribute :title
-  attribute :description
-  attribute :real_score
-  attribute :extra_info
-
-  # Associations
-  attribute :project
-  attribute :estimates
-  attribute :users
-
-  def self.display_name(record)
-    record.title.truncate(30)
-  end
-
-  # Uncomment this to customize the default sort column and direction.
-  # def self.default_sort_column
-  #   "created_at"
-  # end
-  #
-  # def self.default_sort_direction
-  #   "desc"
-  # end
-end
diff --git a/app/madmin/resources/user_resource.rb b/app/madmin/resources/user_resource.rb
deleted file mode 100644
index bc9a6048..00000000
--- a/app/madmin/resources/user_resource.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-class UserResource < Madmin::Resource
-  # Attributes
-  attribute :id, form: false
-  attribute :email
-  attribute :name
-  attribute :admin
-
-  # Associations
-  attribute :estimates
-
-  def self.display_name(record)
-    record.name.truncate(12) || record.email.truncate(12)
-  end
-
-  # Uncomment this to customize the default sort column and direction.
-  # def self.default_sort_column
-  #   "created_at"
-  # end
-  #
-  # def self.default_sort_direction
-  #   "desc"
-  # end
-end
diff --git a/app/madmin/resources/version_jump_resource.rb b/app/madmin/resources/version_jump_resource.rb
deleted file mode 100644
index 6bc0f68f..00000000
--- a/app/madmin/resources/version_jump_resource.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-class VersionJumpResource < Madmin::Resource
-  # Attributes
-  attribute :id, form: false
-  attribute :technology
-  attribute :initial_version
-  attribute :target_version
-
-  # Associations
-  attribute :projects, form: false
-
-  # Uncomment this to customize the display name of records in the admin area.
-  def self.display_name(record)
-    record.to_label
-  end
-
-  # Uncomment this to customize the default sort column and direction.
-  # def self.default_sort_column
-  #   "created_at"
-  # end
-  #
-  # def self.default_sort_direction
-  #   "desc"
-  # end
-end
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 3c34c814..286b2239 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -1,4 +1,4 @@
 class ApplicationMailer < ActionMailer::Base
-  default from: "from@example.com"
-  layout "mailer"
+  default from: 'from@example.com'
+  layout 'mailer'
 end
diff --git a/app/models/comment.rb b/app/models/comment.rb
deleted file mode 100644
index c9d92d11..00000000
--- a/app/models/comment.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class Comment < ApplicationRecord
-  belongs_to :story
-  belongs_to :user
-  validates :body, presence: true
-end
diff --git a/app/models/estimate.rb b/app/models/estimate.rb
index 097780da..184ca636 100644
--- a/app/models/estimate.rb
+++ b/app/models/estimate.rb
@@ -2,9 +2,6 @@ class Estimate < ApplicationRecord
   belongs_to :story
   belongs_to :user
 
-  validates :best_case_points, :worst_case_points, presence: true, numericality: {only_integer: true, greater_than_or_equal_to: 0}
-  validates :story_id, uniqueness: {scope: :user_id}
-
   validate :check_estimates
 
   private
@@ -14,4 +11,5 @@ def check_estimates
       errors.add(:validation_error, "Worst case estimate should be greater than best case estimate.")
     end
   end
+
 end
diff --git a/app/models/project.rb b/app/models/project.rb
index 48f445df..cc7ce90f 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -4,28 +4,13 @@ class Project < ApplicationRecord
   has_many :stories
   has_many :estimates, through: :stories
   has_many :users, through: :estimates
-  belongs_to :version_jump, optional: true
-
-  belongs_to :parent, class_name: "Project", required: false
-  has_many :projects, class_name: "Project", foreign_key: :parent_id, dependent: :destroy
-
-  before_create :add_position
-
-  scope :active, -> { where.not(status: "archived").or(where(status: nil)) }
-  scope :parents, -> { where(parent: nil) }
-  scope :sub_projects_with_approved_and_ordered_stories, ->(project_id) {
-    where(parent_id: project_id)
-      .includes(:stories).references(:stories)
-      .where(stories: {status: :approved})
-      .order("projects.position ASC, stories.position ASC NULLS FIRST")
-  }
 
   def best_estimate_total
-    stories.includes(:estimates).sum(&:best_estimate_average)
+    stories.sum(&:best_estimate_average)
   end
 
   def worst_estimate_total
-    stories.includes(:estimates).sum(&:worst_estimate_average)
+    stories.sum(&:worst_estimate_average)
   end
 
   def real_score_total
@@ -33,80 +18,11 @@ def real_score_total
   end
 
   def best_estimate_sum_per_user(user)
-    stories.includes(:estimates).sum { |x| x.best_estimate_for(user) }
+    stories.sum { |x| x.best_estimate_sum(user) }
   end
 
   def worst_estimate_sum_per_user(user)
-    stories.includes(:estimates).sum { |x| x.worst_estimate_for(user) }
-  end
-
-  def percentage_off_estimate_total(estimate_total, real_score_total)
-    if estimate_total != 0 && real_score_total != 0
-      ((estimate_total - real_score_total).abs / estimate_total) * 100
-    else
-      0
-    end
-  end
-
-  def archived?
-    return parent.archived? if parent_id.present?
-
-    status == "archived"
-  end
-
-  def locked?
-    locked_at.present?
-  end
-
-  def breadcrumb
-    parent.present? ? "#{parent.breadcrumb} » #{title}" : title
-  end
-
-  def toggle_archived!
-    return unless parent_id.nil?
-
-    archived? ? unarchive : archive
+    stories.sum { |x| x.worst_estimate_sum(user) }
   end
 
-  # returns all the sub-projects from its parent's project except self
-  def siblings
-    parent_id ? Project.where(parent_id: parent_id).where.not(id: id) : []
-  end
-
-  def clone_stories_into(clone)
-    stories.each do |story|
-      attrs = story.dup.attributes.slice("title", "description", "position", "extra_info")
-      clone.stories.create(attrs)
-    end
-  end
-
-  def clone_projects_into(clone, only: nil)
-    return if only == []
-
-    to_clone = only.nil? ? projects : projects.where(id: only)
-    to_clone.each do |sub_project|
-      sub_project_clone = clone.projects.create(sub_project.dup.attributes)
-      sub_project.clone_stories_into(sub_project_clone)
-    end
-  end
-
-  private
-
-  def add_position
-    return unless parent
-    return if position
-
-    last_position = parent.projects.where.not(position: nil).order(position: :asc).last&.position || 0
-    self.position = last_position + 1
-  end
-
-  def archive
-    Project.where(id: id).or(Project.where(parent_id: id)).update_all(status: "archived")
-    self.status = "archived"
-  end
-
-  def unarchive
-    Project.where(id: id).or(Project.where(parent_id: id)).update_all(status: nil)
-    self.status = nil
-  end
 end
diff --git a/app/models/report.rb b/app/models/report.rb
index 8f4b6a2b..1e339b0e 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -1,23 +1,5 @@
-require "csv"
+class Story < ApplicationRecord
 
-class Report
-  MINIMUM_ESTIMATES_PER_STORY = 2
+  belongs_to :project
 
-  attr_reader :project
-
-  def initialize(project)
-    @project = project
-  end
-
-  def stories
-    project.stories.by_position
-  end
-
-  def to_csv
-    CSV.generate(headers: ["Story", "Best Estimate Average", "Worst Estimate Average"], write_headers: true) do |csv|
-      stories.each do |story|
-        csv << [story.title, story.best_estimate_average, story.worst_estimate_average]
-      end
-    end
-  end
 end
diff --git a/app/models/story.rb b/app/models/story.rb
index 572832b0..a4109295 100644
--- a/app/models/story.rb
+++ b/app/models/story.rb
@@ -2,68 +2,29 @@ class Story < ApplicationRecord
   validates :title, presence: true
 
   belongs_to :project
-  has_many :estimates
-  has_many :users, through: :estimates
-  has_many :comments
-
-  before_create :add_position
 
-  enum :status, [:pending, :approved, :rejected]
-
-  scope :by_position, -> { order("stories.position ASC NULLS FIRST, stories.created_at ASC") }
+  has_many :estimates
 
   def best_estimate_average
-    return 0 if estimates_count < 2
+    return 0 if self.estimates.length < 2
 
-    best_cases = users_estimates.map(&:best_case_points)
-    (best_cases.sum / users_estimates.length.to_f).round(2)
+    best_cases = self.estimates.pluck(:best_case_points)
+    best_cases.sum / best_cases.length.to_f
   end
 
   def worst_estimate_average
-    return 0 if estimates_count < 2
-
-    worst_cases = users_estimates.map(&:worst_case_points)
-    (worst_cases.sum / users_estimates.length.to_f).round(2)
-  end
-
-  def estimate_for(user)
-    # cache the estimate for each user to not process it every time
-    @estimate_for ||= {}
-    # use the `estimates` association directly to use the cached query to prevent N+1
-    @estimate_for[user] ||= estimates.select { |e| e.user == user }.min_by { |e| e.id }
-    @estimate_for[user]
-  end
+    return 0 if self.estimates.length < 2
 
-  def best_estimate_for(user)
-    estimate_for(user)&.best_case_points || 0
+    worst_cases = self.estimates.pluck(:worst_case_points)
+    worst_cases.sum / worst_cases.length.to_f
   end
 
-  def worst_estimate_for(user)
-    estimate_for(user)&.worst_case_points || 0
+  def best_estimate_sum(user)
+    self.estimates.where(user: user).sum(:best_case_points)
   end
 
-  def percentage_off_estimate(estimate_average)
-    if estimate_average != 0 && !real_score.nil?
-      ((estimate_average - real_score).abs / estimate_average) * 100
-    else
-      0
-    end
+  def worst_estimate_sum(user)
+    self.estimates.where(user: user).sum(:worst_case_points)
   end
 
-  def estimates_count
-    users_estimates.count
-  end
-
-  def users_estimates
-    @users_estimates ||= users.distinct.map { |u| estimate_for(u) }
-  end
-
-  private
-
-  def add_position
-    return if position
-
-    last_position = project.stories.where.not(position: nil).order(position: :asc).last&.position || 0
-    self.position = last_position + 1
-  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 4289fb3e..c8a6a03d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,6 +1,15 @@
 class User < ApplicationRecord
-  include OmbuLabsAuthenticable
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :trackable, :validatable, :omniauthable
 
-  has_many :estimates
-  has_many :comments
+  def self.from_omniauth(auth)
+    user_attributes = {
+      email: auth.info.email,
+      name: auth.info.name,
+      password: Devise.friendly_token[0,20]
+    }
+    where(provider: auth.provider, uid: auth.uid).first_or_create.tap{|user| user.update(user_attributes)}
+   end
 end
diff --git a/app/models/version_jump.rb b/app/models/version_jump.rb
deleted file mode 100644
index 37f0fbac..00000000
--- a/app/models/version_jump.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class VersionJump < ApplicationRecord
-  has_many :projects
-
-  validates :technology, :initial_version, :target_version, presence: true
-  validates :technology, uniqueness: {scope: [:initial_version, :target_version]}
-
-  def to_label
-    "#{technology} / #{initial_version} - #{target_version}"
-  end
-end
diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb
deleted file mode 100644
index e000cba5..00000000
--- a/app/policies/application_policy.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-class ApplicationPolicy
-  attr_reader :user, :record
-
-  def initialize(user, record)
-    @user = user
-    @record = record
-  end
-
-  def index?
-    false
-  end
-
-  def show?
-    false
-  end
-
-  def create?
-    false
-  end
-
-  def new?
-    create?
-  end
-
-  def update?
-    false
-  end
-
-  def edit?
-    update?
-  end
-
-  def destroy?
-    false
-  end
-
-  class Scope
-    def initialize(user, scope)
-      @user = user
-      @scope = scope
-    end
-
-    def resolve
-      raise NotImplementedError, "You must define #resolve in #{self.class}"
-    end
-
-    private
-
-    attr_reader :user, :scope
-  end
-end
diff --git a/app/policies/estimate_policy.rb b/app/policies/estimate_policy.rb
deleted file mode 100644
index 6c9496d3..00000000
--- a/app/policies/estimate_policy.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class EstimatePolicy < ApplicationPolicy
-end
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
deleted file mode 100644
index c0ac8a41..00000000
--- a/app/policies/project_policy.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class ProjectPolicy < ApplicationPolicy
-  attr_reader :user, :project
-
-  def initialize(user, project)
-    @user = user
-    @project = project
-  end
-
-  def update?
-    return false unless project.is_a?(Project)
-
-    return !project.locked_at? if project.parent_id.nil?
-
-    !project.parent.locked_at?
-  end
-end
diff --git a/app/policies/story_policy.rb b/app/policies/story_policy.rb
deleted file mode 100644
index 9c6c7db0..00000000
--- a/app/policies/story_policy.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class StoryPolicy < ApplicationPolicy
-end
diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb
deleted file mode 100644
index 8b6187ab..00000000
--- a/app/policies/user_policy.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class UserPolicy < ApplicationPolicy
-end
diff --git a/app/policies/version_jump_policy.rb b/app/policies/version_jump_policy.rb
deleted file mode 100644
index 47af0fa7..00000000
--- a/app/policies/version_jump_policy.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class VersionJumpPolicy < ApplicationPolicy
-  def update?
-    true
-  end
-
-  def create?
-    true
-  end
-end
diff --git a/app/views/action_plans/show.html.erb b/app/views/action_plans/show.html.erb
deleted file mode 100644
index 2c33d0fe..00000000
--- a/app/views/action_plans/show.html.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="container">
-  <h1 class="dashboard-title"><%= render "shared/project_title", project: @project %></h1>
-  <button class="btn btn-clipboard" data-clipboard-target="#action-plan-content">Copy to clipboard</button>
-
-  <div id="action-plan">
-    <h2>Action Plan</h2>
-
-    <label for="action-plan-prefix">
-      Enter Prefix
-      <input id="action-plan-prefix" name="action-plan-prefix" type="text">
-    </label>
-
-    <div id="action-plan-content">
-      <% idx = 0 %>
-      <% @project_stories.each do |story| %>
-        <% idx += 1 %>
-        <h3 class="action-plan_heading"><span class="index" data-idx="<%= idx %>."></span><%= story.title %></h3>
-        <%= markdown(story.description) %>
-      <% end %>
-
-      <% @children.each do |child| %>
-        <% idx += 1 %>
-        <h3 class="action-plan_heading"><span class="index" data-idx="<%= idx %>."></span><%= child.title %></h3>
-
-        <% child.stories.each_with_index do |story, idx2| %>
-          <h4 class="action-plan_heading"><span class="index" data-idx="<%= idx %>.<%= idx2+1 %>."></span><%= story.title %></h4>
-          <%= markdown(story.description) %>
-        <% end %>
-      <% end %>
-    </div>
-  </div>
-
-  <div class="btn-group">
-    <%= link_to 'Back', project_path(@project), id:"back", class: "button" %>
-  </div>
-</div>
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
deleted file mode 100644
index c4488bd1..00000000
--- a/app/views/comments/_comment.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="comment-card">
-  <p class="bold"><%= display_name(comment.user) %>: <%= markdown(comment.body) %> <%= comment.created_at %><p>
-  <% if current_user == comment.user %>
-    <%= link_to "Edit Comment", edit_project_story_comment_path(project, story, comment), class: "link-blue" %> |
-    <%= link_to "Delete", project_story_comment_path(project, story, comment), method: :delete, data: { confirm: "Are you sure?" }, title: "Delete" %>
-  <% end %>
-</div>
\ No newline at end of file
diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
deleted file mode 100644
index 353235f2..00000000
--- a/app/views/comments/_form.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<%= form_with model: [project, story, comment] do |form| %>
-  <%= form.text_area :body, rows: 6 %>
-  <%= form.submit class: "button green"%>
-  <%= link_to "Back", project_story_path(project, story), id: "back", class: "button" if ["edit", "update"].include?(action_name) %>
-<% end %>
diff --git a/app/views/comments/edit.html.erb b/app/views/comments/edit.html.erb
deleted file mode 100644
index b59ac9d4..00000000
--- a/app/views/comments/edit.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="container">
-  <h2 class="new-edit-title">Edit Comment</h2>
-  <%= render partial: "form", locals: {story: @story, comment: @comment, project: @project} %>
-</div>
\ No newline at end of file
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 9a9e74af..4f011ad7 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,4 +1,3 @@
-<div class="fluid-container center floor signin">
 <h2 class="new-edit-title">Sign in</h2>
 
 <% if flash[:error] %>
@@ -7,7 +6,6 @@
 
 <%- if devise_mapping.omniauthable? %>
   <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), class: "button green", id:"back", method: :post %><br />
+    <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), id:"back" %><br />
   <% end -%>
 <% end -%>
-</div>
diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb
index b97bf163..148544b9 100644
--- a/app/views/devise/shared/_links.html.erb
+++ b/app/views/devise/shared/_links.html.erb
@@ -1,5 +1,5 @@
 <%- if devise_mapping.omniauthable? %>
   <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), class: "button", id:"back" %><br />
+    <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), id:"back" %><br />
   <% end -%>
 <% end -%>
diff --git a/app/views/estimates/_form.html.erb b/app/views/estimates/_form.html.erb
index 309fc9d8..36964af3 100644
--- a/app/views/estimates/_form.html.erb
+++ b/app/views/estimates/_form.html.erb
@@ -1,12 +1,10 @@
-<% remote ||= false %>
-
-<%= form_for [project, story, estimate], remote: remote do |f| %>
-  <% if estimate.errors.any? %>
+<%= form_for [@project, @story, @estimate] do |f| %>
+  <% if @estimate.errors.any? %>
     <div id="error_explanation">
-      <h2><%= pluralize(estimate.errors.count, "error") %> prohibited this estimate from being saved:</h2>
+      <h2><%= pluralize(@estimate.errors.count, "error") %> prohibited this estimate from being saved:</h2>
 
       <ul>
-      <% estimate.errors.full_messages.each do |message| %>
+      <% @estimate.errors.full_messages.each do |message| %>
         <li><%= message %></li>
       <% end %>
       </ul>
@@ -25,11 +23,9 @@
     </div>
   </div>
 
-  <div class="btn-group">
-    <%= f.submit t(".button_text"), value: t(".button_text"), class: "button green", id: "edit" %>
-  </div>
+  <%= f.hidden_field :story_id, value: params[:story_id] %>
 
-  <% if estimate.persisted? %>
-    <%= link_to "Delete Estimate", project_story_estimate_path(project.id, story, estimate.id), method: "delete", data: { confirm: "Are you sure?" }, class: "button magenta" %>
-  <% end %>
+  <div class="actions">
+    <%= f.submit yield(:button_text), class: "btn btn-lg btn-primary", id: "edit" %>
+  </div>
 <% end %>
diff --git a/app/views/estimates/_modal_body.html.erb b/app/views/estimates/_modal_body.html.erb
deleted file mode 100644
index 403cf20f..00000000
--- a/app/views/estimates/_modal_body.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= render "shared/story", story: @story %>
-
-<%= render partial: 'form', locals: {estimate: @estimate, story: @story, project: @project, remote: true} %>
\ No newline at end of file
diff --git a/app/views/estimates/_update_estimates.js.erb b/app/views/estimates/_update_estimates.js.erb
deleted file mode 100644
index be30ea30..00000000
--- a/app/views/estimates/_update_estimates.js.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-(function(){
-  <%= render partial: "update_row", locals: { estimate: @estimate } %>
-})()
\ No newline at end of file
diff --git a/app/views/estimates/_update_row.js.erb b/app/views/estimates/_update_row.js.erb
deleted file mode 100644
index 01260184..00000000
--- a/app/views/estimates/_update_row.js.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-updateStatusLabel("<%= estimate.story.status %>", "<%= estimate.story_id %>")
-
-document.getElementById("best_estimate_<%= estimate.story_id %>").innerText = "<%= j(estimate.best_case_points.to_s) %>"
-document.getElementById("worst_estimate_<%= estimate.story_id %>").innerText = "<%= j(estimate.worst_case_points.to_s) %>"
-
-document.querySelector('.project-table tfoot tr > .best_estimates_total').innerText = "<%= j @project.best_estimate_sum_per_user(current_user) %>"
-document.querySelector('.project-table tfoot tr > .worst_estimates_total').innerText = "<%= j @project.worst_estimate_sum_per_user(current_user) %>"
diff --git a/app/views/estimates/create.js.erb b/app/views/estimates/create.js.erb
deleted file mode 100644
index 1f3aaf4c..00000000
--- a/app/views/estimates/create.js.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-(function(){
-  <% if @estimate.persisted? %>
-    <%= render partial: 'update_row', locals: {estimate: @estimate} %>
-    const addEstimate = document.getElementById("story_<%= @estimate.story_id %>").querySelector('.add-estimate')
-    addEstimate.insertAdjacentHTML('afterend', "<%= j(link_to 'Edit Estimate', edit_project_story_estimate_path(@project.id, @estimate.story, @estimate.id), class: "button edit-estimate", remote: true) %>")
-    addEstimate.remove()
-    closeModal()
-  <% else %>
-    updateModal("New estimate", "<%= j(render partial: 'modal_body') %>")
-  <% end %>
-})()
diff --git a/app/views/estimates/edit.html.erb b/app/views/estimates/edit.html.erb
index 62f639ba..9d4a7f94 100644
--- a/app/views/estimates/edit.html.erb
+++ b/app/views/estimates/edit.html.erb
@@ -1,13 +1,13 @@
-<div class="container">
-  <%= render "shared/story", story: @story %>
+<% provide(:button_text, 'Save Changes') %>
 
-  <hr>
+<%= render "shared/story", story: @story %>
 
-  <h2 class="new-edit-title">Edit Estimate</h2>
+<hr>
 
-  <%= render partial: 'form', locals: {story: @story, estimate: @estimate, project: @project} %>
+<h2 class="new-edit-title">Edit Estimate</h2>
 
-  <hr>
+<%= render 'form', estimate: @estimate %>
 
-  <%= link_to 'Back', project_path(@project.id), id:"back", class: "button" %>
-</div>
\ No newline at end of file
+<hr>
+
+<%= link_to 'Back', project_path(@project.id), id:"back" %>
diff --git a/app/views/estimates/edit.js.erb b/app/views/estimates/edit.js.erb
deleted file mode 100644
index 36c28d6e..00000000
--- a/app/views/estimates/edit.js.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-(function(){
-  showModal("Edit Estimate", "<%= j(render partial: "modal_body") %>")
-})()
\ No newline at end of file
diff --git a/app/views/estimates/new.html.erb b/app/views/estimates/new.html.erb
index 29a0260f..87d0b831 100644
--- a/app/views/estimates/new.html.erb
+++ b/app/views/estimates/new.html.erb
@@ -1,10 +1,11 @@
-<div class="container">
-  <p>New Estimate</p>
-  <%= render "shared/story", story: @story %>
+<% provide(:button_text, 'Create') %>
 
-  <%= render partial: 'form', locals: {estimate: @estimate, story: @story, project: @project} %>
+<%= render "shared/story", story: @story %>
 
-  <hr>
+<h2 class="new-edit-title">New Estimate</h2>
 
-  <%= link_to 'Back', project_path(@project.id), id:"back", class: "button" %>
-</div>
\ No newline at end of file
+<%= render 'form', estimate: @estimate %>
+
+<hr>
+
+<%= link_to 'Back', project_path(@project.id), id:"back" %>
diff --git a/app/views/estimates/new.js.erb b/app/views/estimates/new.js.erb
deleted file mode 100644
index c42d59b6..00000000
--- a/app/views/estimates/new.js.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-(function(){
-  showModal("New Estimate", "<%= j(render partial: "modal_body") %>")
-})()
\ No newline at end of file
diff --git a/app/views/estimates/update.js.erb b/app/views/estimates/update.js.erb
deleted file mode 100644
index 9ff1892b..00000000
--- a/app/views/estimates/update.js.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<% if @estimate.valid? %>
-  <%= render partial: 'update_estimates', locals: {estimate: @estimate} %>
-  closeModal()
-<% else %>
-  updateModal("Edit estimate", "<%= j(render partial: 'modal_body') %>")
-<% end %>
\ No newline at end of file
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index bc047c36..4887a3fe 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -1,4 +1,4 @@
-<div class="fluid-container center floor signin">
+<div class="center jumbotron">
   <h1>Welcome to the Points App</h1>
-  <%= link_to "Sign in", ombu_labs_auth.new_user_session_path, class: "button green", id: "edit" %>
+  <%= link_to "Sign in", new_user_session_path, class: "btn btn-lg btn-primary", id: "edit" %>
 </div>
diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb
index 9f2be66e..e63f3f8a 100644
--- a/app/views/layouts/_flash.html.erb
+++ b/app/views/layouts/_flash.html.erb
@@ -1,8 +1,6 @@
 <% bootstrap_alert_names = {"success" => "success", "error" => "danger"}%>
-<div class="container">
-  <% if flash[:success] || flash[:error] %>
-    <% flash.each do |key, value| %>
-      <div class="alert alert-<%= bootstrap_alert_names[key] %>"><%= value %></div>
-    <% end %>
+<% if flash[:success] || flash[:error] %>
+  <% flash.each do |key, value| %>
+    <div class="alert alert-<%= bootstrap_alert_names[key] %>"><%= value %></div>
   <% end %>
-</div>
+<% end %>
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 5279847e..0a8e5734 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -10,6 +10,6 @@
     </h2>
   </div>
   <div>
-    <p class="txt_footer">Made with ❤ around the world</p>
+    <p class="txt_footer">Made with ❤ in Philadelphia and Buenos Aires</p>
   </div>
 </footer>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 31211238..804b7f89 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,23 +1,14 @@
-<%- title = defined?(header_title) ? header_title : "points app" %>
-<%- link = defined?(header_link) ? header_link : "/projects" %>
-
-<header class="navbar navbar-inverse">
+<header class="navbar navbar-fixed-top navbar-inverse">
   <div class="container">
-    <div class="row">
-      <div class="col-xs-10">
-        <%= link_to title, link, id: "logo" %>
-      </div>
-      <div class="col-xs-2">
-        <nav>
-          <ul class="nav">
-            <% if current_user %>
-              <%= link_to "Sign out", ombu_labs_auth.destroy_user_session_path, method: :delete, class: "button magenta" %>
-            <% else %>
-              <%= link_to "Sign in", ombu_labs_auth.new_user_session_path, class: "button green" %>
-            <% end %>
-          </ul>
-        </nav>
-      </div>
-    </div>
+    <%= link_to "points app", '/projects', id: "logo" %>
+    <nav>
+      <ul class="nav navbar-nav navbar-right">
+        <% if current_user %>
+          <li><%= link_to "Sign out", destroy_user_session_path, method: :delete, id: "login" %></li>
+        <% else %>
+          <li><%= link_to "Sign in", new_user_session_path, id: "login" %></li>
+        <% end %>
+      </ul>
+    </nav>
   </div>
 </header>
diff --git a/app/views/layouts/_modal.html.erb b/app/views/layouts/_modal.html.erb
deleted file mode 100644
index f30b8ebb..00000000
--- a/app/views/layouts/_modal.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="modal" tabindex="-1" role="dialog">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-        <h4 class="modal-title">Modal title</h4>
-      </div>
-      <div class="modal-body">Modal body</div>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b39418c5..a2044936 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,23 +1,20 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= page_title_tag %></title>
+    <title>Points</title>
     <%= csrf_meta_tags %>
-    <!-- Fonts -->
-    <link href='https://fonts.googleapis.com/css?family=Lato:700|Open+Sans:400,300,300italic,400italic,700,700italic' rel='stylesheet' type='text/css'>
-    <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Lato:400,700" rel="stylesheet">
   </head>
   <body class="content <%= controller_name %>-controller <%= action_name %>-action">
     <%= render 'layouts/header' %>
-    <div>
-      <main class="fluid-container">
-        <%= render 'layouts/flash' %>
-        <%= yield %>
-      </main>
-      <%= render 'layouts/footer' %>
-    </div>
-    <%= render 'layouts/modal' %>
+    <main class="container">
+      <%= render 'layouts/flash' %>
+      <%= yield %>
+    </main>
+    <div class="push"></div>
+    <%= render 'layouts/footer' %>
   </body>
 </html>
diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb
deleted file mode 100644
index d03da3af..00000000
--- a/app/views/layouts/devise.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Points - Sign in</title>
-    <%= csrf_meta_tags %>
-    <!-- Fonts -->
-    <link href='https://fonts.googleapis.com/css?family=Lato:700|Open+Sans:400,300,300italic,400italic,700,700italic' rel='stylesheet' type='text/css'>
-    <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
-    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
-  </head>
-  <body class="content <%= controller_name %>-controller <%= action_name %>-action">
-    <%= render 'layouts/header' %>
-    <div>
-      <main class="fluid-container">
-        <%= render 'layouts/flash' %>
-        <%= yield %>
-      </main>
-      <%= render 'layouts/footer' %>
-    </div>
-    <%= render 'layouts/modal' %>
-  </body>
-</html>
diff --git a/app/views/layouts/madmin/application.html.erb b/app/views/layouts/madmin/application.html.erb
deleted file mode 100644
index 674a9501..00000000
--- a/app/views/layouts/madmin/application.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html lang="<%= I18n.locale %>">
-  <head>
-    <meta charset="utf-8">
-    <meta name="ROBOTS" content="NOODP">
-    <meta name="viewport" content="initial-scale=1">
-    <title>
-      Madmin: <%= Rails.application.class %>
-    </title>
-
-    <%= csrf_meta_tags %>
-
-    <%= render "javascript" %>
-  </head>
-  <body class="min-h-screen">
-    <div class="md:flex w-full min-h-screen">
-      <div id="sidebar" class="md:w-64 p-4 flex-shrink-0 border-r">
-        <%= render "navigation" -%>
-      </div>
-      <main class="flex-grow p-4 overflow-x-scroll" role="main">
-        <%#= render "flashes" -%>
-        <%= yield %>
-      </main>
-    </div>
-  </body>
-</html>
diff --git a/app/views/madmin/application/_form.html.erb b/app/views/madmin/application/_form.html.erb
deleted file mode 100644
index 3d2b4337..00000000
--- a/app/views/madmin/application/_form.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<%= form_with model: [:madmin, record], url: (record.persisted? ? resource.show_path(record) : resource.index_path), local: true do |form| %>
-  <% if form.object.errors.any? %>
-    <div class="mb-4 rounded-md text-sm text-red-700 bg-red-100 p-4">
-      <div class="mb-2 font-medium leading-5 text-red-800">There was <%= pluralize form.object.errors.full_messages.count, "error" %> with your submission</div>
-
-      <% form.object.errors.full_messages.each do |message| %>
-        <div class="ml-4"><%= message %></div>
-      <% end %>
-    </div>
-  <% end %>
-
-  <% resource.attributes.values.each do |attribute| %>
-    <% next if attribute.field.nil? %>
-    <% next unless attribute.field.visible?(action_name) %>
-    <% next unless attribute.field.visible?(:form) %>
-
-    <div class="mb-4 md:flex">
-      <%= render partial: attribute.field.to_partial_path("form"), locals: { field: attribute.field, record: record, form: form, resource: resource } %>
-    </div>
-  <% end %>
-
-  <%= form.submit class: "bg-white hover:bg-gray-100 text-gray-800 font-semibold py-2 px-4 border border-gray-400 rounded shadow" %>
-<% end %>
diff --git a/app/views/madmin/application/_javascript.html.erb b/app/views/madmin/application/_javascript.html.erb
deleted file mode 100644
index fb8d4fd5..00000000
--- a/app/views/madmin/application/_javascript.html.erb
+++ /dev/null
@@ -1,107 +0,0 @@
-<script src="https://cdn.tailwindcss.com?plugins=forms,typography,aspect-ratio,line-clamp"></script>
-<%= stylesheet_link_tag "https://unpkg.com/flatpickr/dist/flatpickr.min.css", "data-turbo-track": "reload" %>
-<%= stylesheet_link_tag "https://unpkg.com/trix/dist/trix.css", "data-turbo-track": "reload" %>
-<%= stylesheet_link_tag "https://unpkg.com/tom-select/dist/css/tom-select.min.css", "data-turbo-track": "reload" %>
-
-<script type="importmap" data-turbo-track="reload">
-  {
-    "imports": {
-      "@hotwired/stimulus": "https://unpkg.com/@hotwired/stimulus/dist/stimulus.js",
-      "@hotwired/turbo": "https://unpkg.com/@hotwired/turbo",
-      "@hotwired/turbo-rails": "https://unpkg.com/@hotwired/turbo-rails",
-      "@rails/actiontext": "https://unpkg.com/@rails/actiontext@<%= npm_rails_version %>/app/assets/javascripts/actiontext.js",
-      "@rails/activestorage": "https://unpkg.com/@rails/activestorage@<%= npm_rails_version %>/app/assets/javascripts/activestorage.esm.js",
-      "flatpickr": "https://unpkg.com/flatpickr/dist/esm/index.js",
-      "stimulus-flatpickr": "https://unpkg.com/stimulus-flatpickr@3.0.0-0/dist/index.m.js",
-      "tailwindcss-stimulus-components": "https://unpkg.com/tailwindcss-stimulus-components/dist/tailwindcss-stimulus-components.modern.js",
-      "tom-select": "https://unpkg.com/tom-select/dist/esm/tom-select.complete.js",
-      "trix": "https://unpkg.com/trix"
-    }
-  }
-</script>
-<script async src="https://unpkg.com/es-module-shims/dist/es-module-shims.js"></script>
-
-<script type="module">
-  import * as Turbo from "@hotwired/turbo-rails"
-
-  import * as ActiveStorage from "@rails/activestorage"
-  ActiveStorage.start()
-  import "trix"
-  import "@rails/actiontext"
-
-  import { Application, Controller } from '@hotwired/stimulus'
-  const application = Application.start()
-
-  import { Dropdown } from "tailwindcss-stimulus-components"
-  application.register("dropdown", Dropdown)
-
-  import StimulusFlatpickr from "stimulus-flatpickr"
-  application.register("flatpickr", StimulusFlatpickr)
-
-  import TomSelect from "tom-select"
-
-  (() => {
-    application.register('select', class extends Controller {
-      static values = {
-        options: Object,
-        url: String
-      }
-
-      connect() {
-        this.select = new TomSelect(this.element, {
-          plugins: ['remove_button'],
-          valueField: 'id',
-          labelField: 'name',
-          searchField: 'name',
-          load: (search, callback) => {
-            let url = search ? `${this.urlValue}?q=${search}` : this.urlValue;
-            fetch(url)
-              .then(response => response.json())
-              .then(json => {
-                callback(json);
-              }).catch(() => {
-                callback();
-              });
-          }
-        })
-      }
-
-      disconnect() {
-        this.select.destroy()
-      }
-    })
-
-    application.register('nested-form', class extends Controller {
-      static get targets() {
-        return [ "links", "template" ]
-      }
-
-      connect() {
-        this.wrapperClass = this.data.get("wrapperClass") || "nested-fields"
-      }
-
-      add_association(event) {
-        event.preventDefault()
-
-        var content = this.templateTarget.innerHTML.replace(/NEW_RECORD/g, new Date().getTime())
-        this.linksTarget.insertAdjacentHTML('beforebegin', content)
-      }
-
-      remove_association(event) {
-        event.preventDefault()
-
-        let wrapper = event.target.closest("." + this.wrapperClass)
-
-        // New records are simply removed from the page
-        if (wrapper.dataset.newRecord == "true") {
-          wrapper.remove()
-
-        // Existing records are hidden and flagged for deletion
-        } else {
-          wrapper.querySelector("input[name*='_destroy']").value = 1
-          wrapper.style.display = 'none'
-        }
-      }
-    })
-  })()
-</script>
diff --git a/app/views/madmin/application/_navigation.html.erb b/app/views/madmin/application/_navigation.html.erb
deleted file mode 100644
index 54f5240a..00000000
--- a/app/views/madmin/application/_navigation.html.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="flex flex-col h-full text-sm" data-controller="dropdown">
-  <div class="flex md:block justify-between items-center">
-    <div class="flex md:block items-center">
-      <h1 class="mr-2 md:p-2 text-xl font-semibold">Madmin</h1>
-      <% if main_app.respond_to?(:root_url) %>
-        <%= link_to main_app.root_url, class: "block p-2 rounded hover:bg-gray-200", data: { turbo: false } do %>
-          ← Back <span class="hidden md:inline">to App</span>
-        <% end %>
-      <% end %>
-    </div>
-
-    <div class="-mr-2 flex items-center md:hidden">
-      <button data-action="click->dropdown#toggle touch->dropdown#toggle click@window->dropdown#hide touch@window#dropdown->hide" type="button" class="bg-white rounded-md p-2 inline-flex items-center justify-center text-gray-400 hover:bg-gray-200 focus:outline-none focus:ring-2 focus-ring-inset focus:ring-white" id="main-menu" aria-haspopup="true">
-        <span class="sr-only">Open main menu</span>
-        <!-- Heroicon name: outline/menu -->
-        <svg class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
-          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16"></path>
-        </svg>
-      </button>
-    </div>
-  </div>
-
-  <div class="hidden md:flex flex-col flex-grow justify-between" data-dropdown-target="menu">
-    <% Madmin.resources.each do |resource| %>
-      <%= nav_link_to resource.friendly_name.pluralize, resource.index_path, class: "block p-2 rounded hover:bg-gray-100", starts_with: resource.index_path, active_class: "font-bold text-black" %>
-    <% end %>
-
-    <div class="mt-auto">
-      <%= link_to "View Madmin on GitHub", "https://github.com/excid3/madmin", target: :_blank, class: "block p-2 rounded text-gray-500 hover:bg-gray-100" %>
-    </div>
-  </div>
-</div>
diff --git a/app/views/madmin/application/edit.html.erb b/app/views/madmin/application/edit.html.erb
deleted file mode 100644
index 0d3c8a51..00000000
--- a/app/views/madmin/application/edit.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1 class="text-xl mb-4">
-  <%= link_to resource.friendly_name.pluralize, resource.index_path, class: "text-indigo-500" %>
-  /
-  <strong>Edit <%= link_to resource.display_name(@record), resource.show_path(@record), class: "text-indigo-500" %></strong>
-</h1>
-
-<%= render partial: "form", locals: { record: @record, resource: resource } %>
diff --git a/app/views/madmin/application/index.html.erb b/app/views/madmin/application/index.html.erb
deleted file mode 100644
index ea987e0d..00000000
--- a/app/views/madmin/application/index.html.erb
+++ /dev/null
@@ -1,66 +0,0 @@
-<div class="md:flex justify-between items-center space-y-4 md:space-y-0">
-  <h1 class="text-xl font-semibold"><%= resource.friendly_name.pluralize %></h1>
-
-  <div class="flex-grow flex md:justify-end gap-4">
-    <form class="flex items-center gap-2 relative">
-      <%= hidden_field_tag :page, params[:page], value: 1, class: "hidden" %>
-      <%= search_field_tag :q, params[:q], placeholder: "Search", class: "rounded-full px-4 focus:bg-white focus:border-indigo-500" %>
-      <%= link_to clear_search_params, class: "absolute top-1/2 right-3 text-gray-500 bg-white transform -translate-y-1/2" do %>
-        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
-          <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd" />
-        </svg>
-      <% end %>
-    </form>
-
-    <% if policy(resource).create? %>
-      <%= link_to resource.new_path, class: "bg-white hover:bg-gray-100 text-gray-800 font-semibold py-2 px-4 border border-gray-400 rounded shadow" do %>
-        New <span class="hidden md:inline"><%= resource.friendly_name %></span>
-      <% end %>
-    <% end %>
-  </div>
-</div>
-
-<div class="mb-4">
-  <% if resource.scopes.any? %>
-    <%= link_to "All", resource.index_path, class: class_names("p-2 rounded", {"bg-gray-100" =>  params[:scope].blank?}) %>
-  <% end %>
-
-  <% resource.scopes.each do |scope| %>
-    <%= link_to scope.to_s.humanize, resource.index_path(scope: scope), class: class_names("p-2 rounded", {"bg-gray-100" => params[:scope] == scope.to_s}) %>
-  <% end %>
-</div>
-<div class="min-w-full max-w-xl overflow-x-auto pb-4">
-  <table class="min-w-full divide-y divide-gray-200">
-    <thead>
-      <tr class="border-b border-gray-200">
-        <% resource.attributes.values.each do |attribute| %>
-          <% next if attribute.field.nil? %>
-          <% next unless attribute.field.visible?(action_name) %>
-
-          <th class="py-2 px-4 text-left text-xs text-gray-500 font-medium uppercase whitespace-nowrap"><%= sortable attribute.name, attribute.name.to_s.titleize %></th>
-        <% end %>
-        <th class="py-2 px-4 text-left text-xs text-gray-500 font-medium uppercase">Actions</th>
-      </tr>
-    </thead>
-
-    <tbody class="text-sm divide-y">
-      <% @records.each do |record| %>
-        <tr>
-          <% resource.attributes.values.each do |attribute| %>
-            <% next if attribute.field.nil? %>
-            <% next unless attribute.field.visible?(action_name) %>
-            <td class="px-4 py-2"><%= render partial: attribute.field.to_partial_path("index"), locals: { field: attribute.field, record: record, resource: resource } %></td>
-          <% end %>
-
-          <td class="px-4 py-2 text-center">
-            <%= link_to "View", resource.show_path(record), class: "text-indigo-500" %>
-            <% if policy(resource).update? %>
-              <%= link_to "Edit", resource.edit_path(record), class: "text-indigo-500" %>
-            <% end %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-</div>
-<%== render(partial: 'madmin/pagy/nav', locals: { pagy: @pagy }) if @pagy.pages > 1 %>
diff --git a/app/views/madmin/application/new.html.erb b/app/views/madmin/application/new.html.erb
deleted file mode 100644
index 39a5bd81..00000000
--- a/app/views/madmin/application/new.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1 class="text-xl mb-4">
-  <%= link_to resource.friendly_name.pluralize, resource.index_path, class: "text-indigo-500" %>
-  /
-  <strong>New <%= resource.friendly_name %></strong>
-</h1>
-
-<%= render partial: "form", locals: { record: @record, resource: resource } %>
diff --git a/app/views/madmin/application/show.html.erb b/app/views/madmin/application/show.html.erb
deleted file mode 100644
index 27c35bae..00000000
--- a/app/views/madmin/application/show.html.erb
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="md:flex items-center justify-between mb-4">
-  <h1 class="text-xl">
-    <%= link_to resource.friendly_name.pluralize, resource.index_path, class: "text-indigo-500" %>
-    /
-    <%= link_to resource.display_name(@record), resource.show_path(@record), class: "text-indigo-500 font-bold" %>
-  </h1>
-
-  <div class="flex items-center px-4">
-    <div class="mr-2">
-      <% if policy(resource).update? %>
-        <%= link_to "Edit", resource.edit_path(@record), class: "block bg-white hover:bg-gray-100 text-gray-800 font-semibold py-2 px-4 border border-gray-400 rounded shadow" %>
-      <% end %>
-    </div>
-    <% if policy(resource).destroy? %>
-      <%= button_to "Delete", resource.show_path(@record), method: :delete, data: { turbo_confirm: "Are you sure?" }, class: "bg-white hover:bg-gray-100 text-red-500 font-semibold py-2 px-4 border border-red-500 rounded shadow pointer-cursor" %>
-    <% end %>
-  </div>
-</div>
-
-<div class="divide-y">
-  <% resource.attributes.values.each do |attribute| %>
-    <% next if attribute.field.nil? %>
-    <% next unless attribute.field.visible?(action_name) %>
-
-    <div class="px-4 py-3 md:grid md:grid-cols-4 md:gap-4 md:px-6">
-      <div class="text-sm font-medium text-gray-500">
-        <%= attribute.field.attribute_name.to_s.titleize %>
-      </div>
-
-      <div class="md:col-span-3">
-        <%= render partial: attribute.field.to_partial_path("show"), locals: { field: attribute.field, record: @record, resource: resource } %>
-      </div>
-    </div>
-  <% end %>
-</div>
diff --git a/app/views/projects/_delete_form.html.erb b/app/views/projects/_delete_form.html.erb
deleted file mode 100644
index ec2694bd..00000000
--- a/app/views/projects/_delete_form.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<%= form_with(model: project, method: :delete) do |f| %>
-  This action cannot be undone.
-  This will permanently delete the <strong><%= project.title %></strong> project,
-  stories, and associated estimations.
-
-  <div class="field">
-    <%= f.label :title, raw("Please type <strong>#{project.title}</strong> to confirm.") %>
-    <%= f.text_field :title, value: "", placeholder: "Project's title", autofocus: true, required: true %>
-  </div>
-
-  <%= f.submit "I understand the consequences, delete this project", class: "button magenta" %>
-<% end %>
diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index 68d293c1..c297f804 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -13,15 +13,7 @@
 
   <div class="field">
     <%= f.label :title %>
-    <%= f.text_field :title, placeholder: "Project Title", class: "project-story-title", autofocus: true %>
-  </div>
-
-  <div class="select">
-    <%= f.label :version_jump_id %>
-    <%= f.select :version_jump_id, options_from_collection_for_select(VersionJump.all, :id, :to_label) %>
-  </div>
-
-  <div class="btn-group">
-    <%= f.submit yield(:button_text), class: "button green", id: "edit" %>
+    <%= f.text_field :title, placeholder: "Project Title", class: "project-story-title" %>
   </div>
+  <%= f.submit yield(:button_text), class: "btn btn-lg btn-primary", id: "edit" %>
 <% end %>
diff --git a/app/views/projects/_hierarchy.html.erb b/app/views/projects/_hierarchy.html.erb
deleted file mode 100644
index 5bfacb01..00000000
--- a/app/views/projects/_hierarchy.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<h4>Hierarchy</h4>
-<label>Parent:</label>
-<% top = project.parent ? project.parent : project %>
-<%= link_to top.title, project_path(top) %>
-<label>Sub Projects:</label>
-<ul>
-  <% sub_projects.each do |sub_project| %>
-    <li><%= link_to sub_project.title, project_path(sub_project) %></li>
-  <% end %>
-</ul>
\ No newline at end of file
diff --git a/app/views/projects/_import_export.html.erb b/app/views/projects/_import_export.html.erb
index d3549268..bd85ea06 100644
--- a/app/views/projects/_import_export.html.erb
+++ b/app/views/projects/_import_export.html.erb
@@ -1,28 +1,15 @@
-<details id="import-export">
-  <summary class="import-export-header"">
-    <i class="fa fa-lg fa-chevron-down rotate"></i>
-    <h4 class="import-export-header__text">CSV Import / Export</h4>
-  </summary>
+<details id='import-export'>
+  <summary><h4>CSV Import / Export</h4></summary>
   <section>
-    <div id="import" class="card-deck mb-3">
+    <div id='import' class="card-deck mb-3 text-center">
       <div class="card mb-6 box-shadow">
         <div class="card-header">
           <h4 class="my-0 font-weight-normal">Import CSV</h4>
         </div>
-        <div id="instructions">
-          <span>Instructions:</span>
-          <ul>
-            <li>The file must have the following columns and headers: id, title, description and position.</li>
-            <li>The "title", "description" and "position" column are required.</li>
-            <li>The headers are required.</li>
-          </ul>
-        </div>
         <div class="card-body">
           <%= form_with(url: import_project_stories_path(@project), method: :patch, remote: false) do |f| %>
             <%= f.file_field :file %>
-            <div class="btn-group">
-              <%= f.submit 'Import', class: 'button green' %>
-            </div>
+            <%= f.submit 'Import', class: 'btn btn-sm btn-block btn-primary' %>
           <% end %>
         </div>
       </div>
@@ -31,14 +18,7 @@
           <h4 class="my-0 font-weight-normal">Export CSV</h4>
         </div>
         <div class="card-body">
-          <%= form_with url: export_project_stories_path(@project), method: :get do |f| %>
-            <%= f.submit "Export", class: "button green", data: { disable_with: false } %>
-            <br/>
-            <%= f.label :export_with_comments do %>
-              <%= f.check_box :export_with_comments %>
-              Export with comments
-            <% end %>
-          <% end %>
+          <%= link_to 'Export', export_project_stories_path(@project), class:"btn btn-sm btn-block btn-primary" %>
         </div>
       </div>
     </div>
diff --git a/app/views/projects/_sub_project_form.html.erb b/app/views/projects/_sub_project_form.html.erb
deleted file mode 100644
index 9e544af7..00000000
--- a/app/views/projects/_sub_project_form.html.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<%= form_with(model: project) do |f| %>
-  <% if project.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(project.errors.count, "error") %> prohibited this project from being saved:</h2>
-
-      <ul>
-      <% project.errors.full_messages.each do |message| %>
-        <li><%= message %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <div class="field">
-    <%= f.label :title %>
-    <%= f.text_field :title, placeholder: "Subproject Title", class: "project-story-title", autofocus: true %>
-    <%= f.hidden_field :parent_id, value: parent.id %>
-  </div>
-
-  <div class="select">
-    <%= f.label :version_jump_id %>
-    <%= f.select :version_jump_id, options_from_collection_for_select(VersionJump.all, :id, :to_label) %>
-  </div>
-
-  <div class="btn-group">
-    <%= f.submit yield(:button_text), class: "button green", id: "edit" %>
-  </div>
-<% end %>
diff --git a/app/views/projects/edit.html.erb b/app/views/projects/edit.html.erb
index f35e27cc..8f139d36 100644
--- a/app/views/projects/edit.html.erb
+++ b/app/views/projects/edit.html.erb
@@ -1,21 +1,12 @@
-<div class="container">
-  <% provide(:button_text, 'Save Changes') %>
-  <h2 class="new-edit-title">Edit or Delete Project</h2>
+<% provide(:button_text, 'Save Changes') %>
+<h2 class="new-edit-title">Edit or Delete Project</h2>
 
-  <%= render 'form', project: @project%>
-  <hr>
+<%= render 'form', project: @project %>
 
-  <% if @project.projects.count > 0 %>
-    <h3 class="new-edit-title">Subprojects</h3>
-    <% @project.projects.each do |proj| %>
-      <%= link_to proj.title, edit_project_path(proj) %>
-    <% end %>
+<hr>
 
-    <hr>
-  <% end %>
+<%= link_to 'Delete Project', project_path(@project.id), method: "delete",  data: { confirm: 'Are you sure?' }, class: "btn btn-lg btn-primary", id: "delete" %>
 
-  <div class="btn-group">
-    <%= link_to 'Delete Project', project_path(@project.id), method: "delete",  data: { confirm: 'Are you sure?' }, class: "button red", id: "delete" %>
-    <%= link_to 'Back', project_path(@project.id), id:"back", class: "button" %>
-  </div>
-</div>
+<hr>
+
+<%= link_to 'Back', project_path(@project.id), id:"back" %>
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
index afa08173..99f38727 100644
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -1,46 +1,22 @@
-<div class="container">
-  <h1 class="home-title">Projects</h1>
+<h1 class="dashboard-title">My Projects</h1>
 
-  <% if @projects.any? %>
-    <div class="row" id="projects">
-      <% @projects.each do | project | %>
-        <div class="col-sm-6 col-lg-4">
-          <div class="project-card" id="project_<%= project.id %>">
-            <%= link_to project_path(project.id) do %>
-              <div>
-                <h2><%= project.title %></h2>
-                <% if project.locked? %>
-                  <span class="status-badge locked">Locked</span>
-                <% end %>
-                <% if project.status.present? %>
-                  <span class="status-badge <%= project.status %>"><%= project.status %></span>
-                <% end %>
-                <%= version_jump_badge(project) %>
-              </div>
-            <% end %>
-            <div class="sortable-projects" data-url="<%= sort_project_path(project.id) %>">
-              <% project.projects.each do |subproj| %>
-                <%= link_to subproj.title, project_path(subproj), class: "project-card sub", id: dom_id(subproj) %>
-              <% end %>
-            </div>
-          </div>
+<% if @projects.present? %>
+  <div class="row">
+    <% @projects.each do | project | %>
+      <div class="col-sm-6 col-lg-4">
+        <div class="card-blue">
+          <h2 class="project-title"><%= link_to project.title, project_path(project.id), class: "link" %></h2>
         </div>
-      <% end %>
-    </div>
-  <% else %>
-    <p> You don't have any active projects. </p>
-  <% end %>
-
-  <div class="btn-group">
-    <%= link_to "Add a Project", new_project_path, class: "button green", id: "create-button" %>
-    <% if params[:archived] == "true" %>
-      <%= link_to "Hide Archived Projects", projects_path, class: "button" %>
-    <% else %>
-      <%= link_to "See Archived Projects", projects_path(archived: true), class: "button" %>
-    <% end %>
-    <% if current_user.admin? %>
-      <%= link_to "View Reports", reports_index_path, class: "button", id: "create-button" %>
+      </div>
     <% end %>
   </div>
+<% else %>
+  <p> You don't have any projects yet. </p>
+<% end %>
 
+<div class="wrapper">
+  <%= link_to "Add a Project", new_project_path, class: "btn btn-lg btn-primary", id: "create-button" %>
+  <% if current_user.admin? %>
+    <%= link_to "View Reports", reports_index_path, class: "btn btn-lg btn-primary", id: "create-button" %>
+  <% end %>
 </div>
diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
index 2c4e34e8..6a9a562a 100644
--- a/app/views/projects/new.html.erb
+++ b/app/views/projects/new.html.erb
@@ -1,10 +1,8 @@
-<div class="container">
-  <% provide(:button_text, 'Create') %>
-  <h2 class="new-edit-title">Create New Project</h2>
+<% provide(:button_text, 'Create') %>
+<h2 class="new-edit-title">Create New Project</h2>
 
-  <%= render 'form', project: @project %>
+<%= render 'form', project: @project %>
 
-  <hr>
+<hr>
 
-  <%= link_to 'Back', projects_path, id:"back", class: "button" %>
-</div>
+<%= link_to 'Back', projects_path, id:"back" %>
diff --git a/app/views/projects/new_clone.html.erb b/app/views/projects/new_clone.html.erb
deleted file mode 100644
index 0a5e70eb..00000000
--- a/app/views/projects/new_clone.html.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="container">
-  <h2>Clone project <%= @original.title %></h2>
-
-  <%= form_for @original, url: clone_project_path(@original), method: :post do |f| %>
-    <div class="field">
-      <%= f.label :title %>
-      <%= f.text_field :title, placeholder: "Project Title", class: "project-story-title" %>
-    </div>
-
-    <div class="field">
-      <%= f.label :parent_id %>
-      <%= f.select :parent_id, options_from_collection_for_select(Project.active.parents, :id, :title, selected: @original.parent_id), include_blank: "None" %>
-    </div>
-
-    <div class="select">
-      <%= f.label :version_jump_id %>
-      <%= f.select :version_jump_id, options_from_collection_for_select(VersionJump.all, :id, :to_label) %>
-    </div>
-
-    <% if @original.projects.any? %>
-      <div id="sub-projects-to-clone">
-        <h4>Sub-projects to clone</h4>
-        <p>Select which sub-projects will be cloned</p>
-        <% @original.projects.each do |sub| %>
-          <label>
-            <%= check_box_tag "sub_project_ids[]", sub.id, checked: true %>
-            <%= sub.title %>
-          </label>
-        <% end %>
-        <%= button_tag "Select all", id: "select-all" %>
-        <%= button_tag "Unselect all", id: "unselect-all" %>
-        <p class="no-parent-disclaimer">Can't clone sub-projects if it's not a parent project</p>
-      </div>
-    <% end %>
-
-    <div class="actions">
-      <%= button_tag "Clone", class: "button green", type: "submit" %>
-      <%= link_to 'Back', project_path(@original.id), id: "back", class: "button" %>
-    </div>
-  <% end %>
-</div>
diff --git a/app/views/projects/new_sub_project.html.erb b/app/views/projects/new_sub_project.html.erb
deleted file mode 100644
index 3fb234fd..00000000
--- a/app/views/projects/new_sub_project.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="container">
-  <% provide(:button_text, 'Create') %>
-  <h3 class="new-edit-title"><%= @project.title %></h3>
-  <h2 class="new-edit-title">Create New Subproject</h2>
-
-  <%= render 'sub_project_form', project: @sub, parent: @project %>
-
-  <hr>
-
-  <%= link_to 'Back', project_path(@project), id:"back", class: "button" %>
-</div>
diff --git a/app/views/projects/open_delete_modal.js.erb b/app/views/projects/open_delete_modal.js.erb
deleted file mode 100644
index a2887254..00000000
--- a/app/views/projects/open_delete_modal.js.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-(function(){
-  showModal("Are you absolutely sure?", "<%= j(render('delete_form', project: @project)) %>")
-})()
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index da676373..8905f98e 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -1,123 +1,61 @@
-<div class="container">
-  <div class="header">
-    <h1 class="dashboard-title"><%= render partial: "shared/project_title", locals: {allow_edit: true, project: @project} %></h1>
-
-    <div class="search-field">
-      <%= label_tag 'title_contains', "Filter by title or ID" %>
-      <%= search_field_tag 'title_contains', nil, onkeyup: "filterStories()" %>
-    </div>
-  </div>
-
-  <div class="row project-details">
-    <div class="col-xs-<%= @sidebar_projects.any? ? 10 : 12 %>">
-      <table class="project-table">
-        <thead class="table-header fixed-header">
-          <tr class="project-table__row project-table__row--header">
-            <th class="project-table__cell">Story Title</th>
-            <th class="project-table__cell">Status</th>
-            <th class="project-table__cell">Best<br />Estimate</th>
-            <th class="project-table__cell">Worst<br />Estimate</th>
-            <th class="project-table__cell story_actions">
-              <%= link_unless_archived(@project, "Add a Story", new_project_story_path(@project), classes: "green") if is_unlocked?(@project) %>
-              <button id="bulk_delete" class="button magenta" aria-disabled="true" disabled>Bulk Delete</button>
-            </th>
-          </tr>
-        </thead>
-        <tbody id="stories" data-url="<%= sort_stories_project_path(@project.id) %>" data-unlocked="<%= is_unlocked?(@project) %>">
-          <% if @stories.present? %>
-            <% @stories.each do | story | %>
-              <tr class="project-table__row project-table__row--story" id="<%= dom_id(story)%>" data-status="<%= story.status %>">
-                <td class="project-table__cell">
-                  <span class="popup">Copied to clipboard</span>
-                  <input type="checkbox" name="stories[]" value="<%= story.id %>">
-                  <%= link_to "#{story.id} - #{story.title}", [story.project, story] %>
-                </td>
-                <td class="project-table__cell status"><%= status_label(story) %></td>
-                <td class="project-table__cell" id="best_estimate_<%= story.id %>"><%= story.estimate_for(current_user)&.best_case_points %></td>
-                <td class="project-table__cell" id="worst_estimate_<%= story.id %>"><%= story.estimate_for(current_user)&.worst_case_points %></td>
-                <td class="project-table__cell story_actions">
-                <% if is_unlocked?(@project) %>
-                  <% if estimated(story) %>
-                    <%= link_unless_archived(@project, "Edit Estimate", edit_project_story_estimate_path(@project.id, story, @estimate_id), classes: "edit-estimate", remote: true) %>
-                  <% else %>
-                    <%= link_unless_archived(@project, "Add Estimate", new_project_story_estimate_path(@project.id, story), classes: "add-estimate green", remote: true) %>
-                  <% end %>
-
-                  <div class="dropdown-wrapper more-actions">
-                    <button class="button" title="More actions">
-                      <i class="fa fa-ellipsis-v"></i>
-                    </button>
-                    <div class="dropdown">
-
-                      <button class="copy-link btn-clipboard" data-clipboard-text="<%= project_story_url(@project, story) %>" title='Copy story'>
-                        <i class="fa fa-link"></i>Copy Link</button>
-
-                      <%= link_unless_archived(@project, "Edit", edit_project_story_path(@project, story), classes: "edit", icon: 'pencil-square-o') %>
-
-                      <% if @siblings.any? %>
-                        <div class="dropdown-wrapper move-story">
-                          <button title="Move to">
-                            <i class="fa fa-share-square-o"></i>
-                            <span>Move to</span>
-                          </button>
-                          <div class="dropdown">
-                            <% @siblings.each do |to_project| %>
-                              <%= button_to to_project.title, project_story_move_path(@project, story, to_project: to_project), method: :put, data: {confirm: "Are you sure?"} %>
-                            <% end %>
-                          </div>
-                        </div>
-                      <% end %>
-
-                      <%= link_unless_archived(@project, "Delete", project_story_path(@project.id, story), classes: "delete", icon: 'trash-o', method: :delete, remote: true, data_attr: { confirm: 'Are you sure?', story_id: story.id }) %>
-                      <%= link_unless_archived(@project, "Clone", new_project_story_path(@project.id, story_id: story.id), classes: "clone", icon: 'files-o') %>
-                    </div>
-                  </div>
-                <% end %>
-                </td>
-              </tr>
-            <% end %>
-          <% else %>
-            <p> You don't have any stories yet. </p>
-          <% end %>
-        </tbody>
-        <tfoot>
-          <tr class="project-table__row project-table__row--footer">
-            <td class="project-table__cell">Total estimates</td>
-            <td class="project-table__cell"></td>
-            <td class="project-table__cell best_estimates_total"><%= @project.best_estimate_sum_per_user(current_user) %></td>
-            <td class="project-table__cell worst_estimates_total"><%= @project.worst_estimate_sum_per_user(current_user) %></td>
-            <td class="project-table__cell"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </div>
-
-    <% if @sidebar_projects.any? %>
-      <aside class="col-xs-2 hierarchy">
-        <%= render partial: "hierarchy", locals: {project: @project, sub_projects: @sidebar_projects} %>
-      </aside>
-    <% end %>
-  </div>
-
-  <%= render partial: "projects/import_export" if is_unlocked?(@project) %>
-
-  <div class="btn-group actions">
-    <%= link_to 'Return to Projects Page', projects_path, id: :back, class: "button" %>
-    <% if current_user.admin? %>
-      <%= button_to is_unlocked?(@project) ? 'Lock Project' : 'Unlock Project', toggle_locked_project_path(@project.id), method: :patch, class: "button magenta", id: "lock-btn", remote: true %>
-    <% end %>
-    <%= link_to 'Clone Project', new_clone_project_path(@project.id), class: "button green" %>
-    <%= link_to 'Edit Project', edit_project_path(@project.id), class: "button green" %>
-
-    <% if is_unlocked?(@project) %>
-      <%= link_unless_archived(@project, "Add Sub-Project", project_new_sub_project_path(@project), classes: :green) unless @project.parent_id.present? %>
-      <%= link_unless_archived(@project, "Delete Project", open_delete_modal_project_path(@project.id), classes: "delete magenta", remote: true) %>
-    <% end %>
-
-    <% unless @project.parent_id %>
-      <%= link_to "#{@project.archived? ? 'Unarchive' : 'Archive'} Project", toggle_archive_project_path(@project.id), method: "patch", id: "toggle_archive", class: "button magenta", remote: true %>
+<h1 class="dashboard-title"><%= @project.title %></h1>
+<%= render partial: "projects/import_export" %>
+
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th scope="col" class="col-title" id="wide">Story Title</th>
+      <th scope="col" class="col-title">Best Estimate</th>
+      <th scope="col" class="col-title">Worst Estimate</th>
+      <th scope="col" class="col-title"> </th>
+      <th scope="col" class="col-title"> </th>
+      <th scope="col" class="col-title"> </th>
+      <th scope="col" class="col-title"> <button id="bulk_delete" class="btn btn-md btn-danger">Delete</button> </th>
+    </tr>
+  </thead>
+
+  <tbody id="stories" data-url="<%= sort_project_path(@project.id) %>">
+    <% @stories.each do | story | %>
+      <tr id="<%= dom_id(story)%>" >
+        <td id="wide">
+          <div class="checkbox"><input type="checkbox" name="stories[]" value=<%= story.id %>></div>
+          <%= link_to story.title, [story.project, story] %>
+        </td>
+        <td><%= story.estimates.where(user: current_user)&.first&.best_case_points %></td>
+        <td><%= story.estimates.where(user: current_user)&.first&.worst_case_points %></td>
+        <td><%= link_to 'Clone', new_project_story_path(@project.id, story_id: story.id), class: "btn btn-lg btn-primary", id: "edit" %></td>
+        <td><%= link_to 'Edit', edit_project_story_path(@project.id, story), class: "btn btn-lg btn-primary", id: "edit" %></td>
+        <% if estimated(story) %>
+          <td><%= link_to 'Edit Estimate', edit_project_story_estimate_path(@project.id, story, @estimate_id), class: "btn btn-lg btn-primary", id: "edit" %></td>
+        <% else %>
+          <td><%= link_to 'Add Estimate', new_project_story_estimate_path(@project.id, story), class: "btn btn-lg btn-primary", id: "edit" %></td>
+        <% end %>
+        <td><%= link_to 'Delete', project_story_path(@project.id, story), method: "delete",  data: { confirm: 'Are you sure?' }, class: "btn btn-lg btn-primary", id: "edit" %></td>
+      </tr>
     <% end %>
-    <%= link_to "Generate Action Plan", project_action_plan_path(@project.id), class: "button green" %>
-    <%= link_to "View Report", project_report_path(@project.id), class: "button" if current_user.admin? %>
-  </div>
-</div>
+  </tbody>
+
+  <tfoot>
+    <tr>
+      <td id="wide"></td>
+      <td class="totals" id="best"><%= @project.best_estimate_sum_per_user(current_user) %></td>
+      <td class="totals" id="worst"><%= @project.worst_estimate_sum_per_user(current_user) %></td>
+      <td></td>
+      <td></td>
+      <td></td>
+    </tr>
+  </tfoot>
+</table>
+
+<nav class="wrapper actions">
+  <%= link_to "Add a Story", new_project_story_path(@project.id) %>
+  <%= link_to "Edit or Delete Project", edit_project_path(@project.id) %>
+  <% if current_user.admin? %>
+    <%= link_to "View Report", project_report_path(@project.id) %>
+  <% end %>
+</nav>
+
+<hr>
+</br>
+
+<%= link_to 'Return to Projects Page', projects_path, id:"back" %>
diff --git a/app/views/projects/toggle_archive.js.erb b/app/views/projects/toggle_archive.js.erb
deleted file mode 100644
index 85531403..00000000
--- a/app/views/projects/toggle_archive.js.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-(function() {
-  toggleButtonText();
-  window.location.reload();
-})()
-
-function toggleButtonText() {
-  let button_text = document.querySelector('#toggle_archive');
-
-  if (button_text.textContent == "Archive Project") {
-    button_text.textContent = "Unarchive Project";
-  } else {
-    button_text.textContent = "Archive Project";
-  }
-}
diff --git a/app/views/projects/toggle_locked.js.erb b/app/views/projects/toggle_locked.js.erb
deleted file mode 100644
index 200e9dac..00000000
--- a/app/views/projects/toggle_locked.js.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-(function(){
-  location.reload()
-})()
diff --git a/app/views/projects/update.js.erb b/app/views/projects/update.js.erb
deleted file mode 100644
index 2039023b..00000000
--- a/app/views/projects/update.js.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-(function(){
-  document.querySelector(".project-title > button").innerText = "<%= @project.title %>";
-  document.querySelector(".project-title").classList.remove("editing");
-  document.getElementById("logo").innerText = "<%= j header_title %>";
-  <% if @project.parent || @project.projects.any? %>
-    document.querySelector(".hierarchy").innerHTML = "<%= j(render partial: "hierarchy", locals: {project: @project, sub_projects: @sidebar_projects}) %>";
-  <% end%>
-})()
diff --git a/app/views/real_scores/edit.html.erb b/app/views/real_scores/edit.html.erb
index bea64523..153c4ccf 100644
--- a/app/views/real_scores/edit.html.erb
+++ b/app/views/real_scores/edit.html.erb
@@ -1,46 +1,40 @@
-<div class="container">
-  <h1 class="dashboard-title"><%= @project.title %> Real Scores</h1>
-  <%= form_with scope: :stories, url: real_scores_project_stories_path(@project), method: :patch do |form| %>
+<h1 class="dashboard-title"><%= @project.title %> Real Scores</h1>
+<%= form_with scope: :stories, url: real_scores_project_stories_path(@project), method: :patch do |form| %>
+  <table class="table table-striped">
+    <thead>
+      <tr>
+        <th scope="col" class="col-title" id="wide">Story Title</th>
+        <th scope="col" class="col-title">Average: Best Estimates</th>
+        <th scope="col" class="col-title">Average: Worst Estimates</th>
+        <th scope="col" class="col-title">Real Score</th>
+      </tr>
+    </thead>
 
-    <table class="project-table">
-
-      <thead>
-        <tr class="project-table__row project-table__row--real-scores project-table__row--header">
-          <td class="project-table__cell">Story Title</td>
-          <td class="project-table__cell">Average: Best Estimates</td>
-          <td class="project-table__cell">Average: Worst Estimates</td>
-          <td class="project-table__cell">Real Score</td>
+    <tbody>
+      <% @stories.each do | story | %>
+        <tr>
+          <td id="wide"><%= link_to story.title, [@project, story], target: "_blank" %></td>
+          <td><%= best_estimate_for_story(story) %></td>
+          <td><%= worst_estimate_for_story(story) %></td>
+          <td><%= form.select "story_#{story.id}", options_for_select(fib_numbers, story.real_score) %></td>
         </tr>
-      </thead>
+      <% end %>
+    </tbody>
 
-      <tbody id="stories">
-        <% if @stories.present? %>
-          <% @stories.each do | story | %>
-            <tr class="project-table__row project-table__row--real-scores project-table__row--story">
-              <td class="project-table__cell"><%= link_to story.title, [@project, story], target: "_blank" %></td>
-              <td class="project-table__cell"><%= best_estimate_for_story(story) %></td>
-              <td class="project-table__cell"><%= worst_estimate_for_story(story) %></td>
-              <td class="project-table__cell"><%= form.number_field "story_#{story.id}", value: "#{story.real_score}" %></td>
-            </tr>
-          <% end %>
-        <% else %>
-            <p> This user doesn't have any stories yet. </p>
-        <% end %>
-      </tbody>
+    <tfoot>
+      <tr>
+        <td></td>
+        <td class="totals" id="best"><%= @project.best_estimate_total %></td>
+        <td class="totals" id="worst"><%= @project.worst_estimate_total %></td>
+        <td><%=form.submit "Submit", class: "btn btn-primary"%></td>
+      </tr>
+    </tfoot>
 
-      <tfoot>
-        <tr class="project-table__row project-table__row--real-scores project-table__row--footer">
-          <td class="project-table__cell"></td>
-          <td class="project-table__cell"><%= @project.best_estimate_total %></td>
-          <td class="project-table__cell"><%= @project.worst_estimate_total %></td>
-          <td class="project-table__cell"><%=form.submit "Submit", class: "button green"%></td>
-        </tr>
-      </tfoot>
+  </table>
+<% end %>
+
+<%= link_to 'Back', reports_index_path, id:"back" %>
 
-    </table>
-  <% end %>
+|
 
-  <div class="btn-group">
-    <%= link_to 'Back', reports_index_path, id: "back", class: "button" %>
-  </div>
-</div>
+<%= link_to 'Populate Real Scores' %>
diff --git a/app/views/reports/index.html.erb b/app/views/reports/index.html.erb
index 4de931c1..fc4942e8 100644
--- a/app/views/reports/index.html.erb
+++ b/app/views/reports/index.html.erb
@@ -1,34 +1,28 @@
-<div class="container">
-  <h1 class="dashboard-title-report">Project Reports</h1>
+<h1 class="dashboard-title">Project Reports</h1>
 
-  <table class="project-table">
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th scope="col" class="col-title">Project</th>
+      <th scope="col" class="col-title">Report</th>
+    </tr>
+  </thead>
 
-    <thead class="fixed-header">
-      <tr class="project-table__row project-table__row--project-reports project-table__row--header">
-        <td class="project-table__cell">Project</td>
-        <td class="project-table__cell">Report</td>
+  <tbody>
+    <% @projects.each do | project | %>
+      <tr>
+        <td><%= project.title%></td>
+        <td><%= link_to "View Report", project_report_path(project.id), class: "link" %></td>
       </tr>
-    </thead>
+    <% end %>
+    <% if @projects.empty? %>
+    <tr><td>No Projects</td><td></td></tr>
+    <% end %>
+  </tbody>
+</table>
 
-    <tbody id="stories">
-      <% if @projects.present? %>
-        <% @projects.each do | project | %>
-        <tr class="project-table__row project-table__row--project-reports project-table__row--story">
-          <td class="project-table__cell">
-            <span class="status-badge locked <%= "hide" if project.locked_at.nil? %>">Locked</span>
-            <%= project.title%>
-          </td>
-          <td class="project-table__cell"><%= link_to "View Report", project_report_path(project.id), class: "button green" %></td>
-        </tr>
-        <% end %>
-      <% else %>
-          <p> No Projects </p>
-      <% end %>
-    </tbody>
+</br>
+<hr>
+</br>
 
-  </table>
-
-  <div class="btn-group">
-    <%= link_to 'Return to Projects Page', projects_path, id:"back", class: "button" %>
-  </div>
-</div>
+<%= link_to 'Return to Projects Page', projects_path, id:"back" %>
diff --git a/app/views/reports/show.html.erb b/app/views/reports/show.html.erb
index 3f40c37c..4953cf48 100644
--- a/app/views/reports/show.html.erb
+++ b/app/views/reports/show.html.erb
@@ -1,75 +1,55 @@
-<div class="container">
-  <div class="heading">
-    <h1 class="dashboard-title-report"><%= @project.title %> Report</h1>
-    <span class="status-badge locked <%= "hide" if @project.locked_at.nil? %>">Locked</span>
-  </div>
-  <table class="project-table">
-    <thead class="fixed-header">
-      <tr class="project-table__row project-table__row--reports project-table__row--header">
-        <td class="project-table__cell">Story Title</td>
-        <% @users.each do |user| %>
-          <td class="project-table__cell"><%= display_name(user) %>'s Best Estimate</td>
-          <td class="project-table__cell"><%= display_name(user) %>'s Worst Estimate</td>
-        <% end %>
-        <td class="project-table__cell"></td>
-        <td class="project-table__cell">Average: Best Estimates</td>
-        <td class="project-table__cell">Average: Worst Estimates</td>
-        <% if @real_score_exists %>
-          <td class="project-table__cell">Real Score</td>
-        <% end %>
-        <td class="project-table__cell">Percentage off from Best Estimate</td>
-        <td class="project-table__cell">Percentage off from Worst Estimate</td>
-      </tr>
-    </thead>
+<h1 class="dashboard-title"><%= @project.title %> Report</h1>
 
-    <tbody id="report-stories">
-      <% if @stories.present? %>
-        <% @stories.each do | story | %>
-        <tr class="project-table__row project-table__row--reports project-table__row--story">
-          <td class="project-table__cell"><%= link_to story.title, [@project, story], target: "_blank" %></td>
-          <% @users.each do |user| %>
-            <td class="project-table__cell"><%= user_estimate(story, user, 'best') %></td>
-            <td class="project-table__cell"><%= user_estimate(story, user, 'worst') %></td>
-          <% end %>
-          <td class="project-table__cell"></td>
-          <td class="project-table__cell"><%= best_estimate_for_story(story) %></td>
-          <td class="project-table__cell"><%= worst_estimate_for_story(story) %></td>
-          <% if @real_score_exists %>
-            <td class="project-table__cell"><%= story.real_score %></td>
-          <% end %>
-          <td class="project-table__cell"><%= number_to_percentage(story.percentage_off_estimate(story.best_estimate_average), precision: 2) %></td>
-          <td class="project-table__cell"><%= number_to_percentage(story.percentage_off_estimate(story.worst_estimate_average), precision: 2) %></td>
-        </tr>
-        <% end %>
-      <% else %>
-          <p> This user doesn't have any stories yet. </p>
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th scope="col" class="col-title" id="wide">Story Title</th>
+      <% @users.each do |user| %>
+        <th scope="col" class="col-title"><%= user.name %>'s Best Estimate</th>
+        <th scope="col" class="col-title"><%= user.name %>'s Worst Estimate</th>
       <% end %>
+      <th scope="col" class="col-title"></th>
+      <th scope="col" class="col-title">Average: Best Estimates</th>
+      <th scope="col" class="col-title">Average: Worst Estimates</th>
+      <th scope="col" class="col-title">Real Score</th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @stories.each do | story | %>
+      <tr>
+        <td id="wide"><%= link_to story.title, [@project, story], target: "_blank" %></td>
 
-    </tbody>
-    <tfoot>
-      <tr class="project-table__row project-table__row--reports project-table__row--footer">
-        <td class="project-table__cell"></td>
         <% @users.each do |user| %>
-          <td class="project-table__cell"><%= @project.best_estimate_sum_per_user(user) %></td>
-          <td class="project-table__cell"><%= @project.worst_estimate_sum_per_user(user) %></td>
-        <% end %>
-        <td class="project-table__cell">Total Points</td>
-        <td class="project-table__cell"><%= @project.best_estimate_total %></td>
-        <td class="project-table__cell"><%= @project.worst_estimate_total %></td>
-        <% if @real_score_exists %>
-          <td class="project-table__cell"><%= @project.real_score_total %></td>
+          <td><%= user_estimate(story, user, 'best') %></td>
+          <td><%= user_estimate(story, user, 'worst') %></td>
         <% end %>
-        <td class="project-table__cell"><%= number_to_percentage(@project.percentage_off_estimate_total(@project.best_estimate_total, @project.real_score_total), precision: 2) %></td>
-        <td class="project-table__cell"><%= number_to_percentage(@project.percentage_off_estimate_total(@project.worst_estimate_total, @project.real_score_total), precision: 2) %></td>
+        <td></td>
+        <td><%= best_estimate_for_story(story) %></td>
+        <td><%= worst_estimate_for_story(story) %></td>
+        <td><%= story.real_score %></td>
       </tr>
-    </tfoot>
-  </table>
-
-  <div class="btn-group">
-    <%= link_to 'Back', reports_index_path, id:"back", class: "button" %>
-    <%= link_to 'Edit Real Scores', real_scores_project_stories_path(@project), class: "button" %>
-    <%= link_to_if @can_generate_estimate_report, 'Download Average Estimate Report', project_report_path(@project, format: 'csv'), class: "button green" do %>
-      Stories need at least 2 estimates to generate report
     <% end %>
-  </div>
-</div>
+  </tbody>
+
+  <tfoot>
+    <tr>
+      <td id="wide"></td>
+      <% @users.each do |user| %>
+        <td id="best"><%= @project.best_estimate_sum_per_user(user) %></td>
+        <td id="worst"><%= @project.worst_estimate_sum_per_user(user) %></td>
+      <% end %>
+      <td class="totals"> Total Points </td>
+      <td class="totals" id="best"><%= @project.best_estimate_total %></td>
+      <td class="totals" id="worst"><%= @project.worst_estimate_total %></td>
+      <td class="totals" id="worst"><%= @project.real_score_total %></td>
+    </tr>
+  </tfoot>
+
+</table>
+
+<%= link_to 'Back', reports_index_path, id:"back" %>
+
+|
+
+<%= link_to 'Populate Real Scores', real_scores_project_stories_path(@project) %>
diff --git a/app/views/shared/_project_title.html.erb b/app/views/shared/_project_title.html.erb
deleted file mode 100644
index 2c3b1cfe..00000000
--- a/app/views/shared/_project_title.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<% allow_edit ||= false %>
-
-<% if project.parent %>
-  <span class="parent-link">
-    <%= link_to project.parent.title, project_path(project.parent) %> &raquo;
-  </span>
-<% end %>
-
-<% if allow_edit && is_unlocked?(project) %>
-  <div class="project-title">
-    <button><%= project.title %></button>
-    <%= form_for project, remote: true do |f| %>
-      <%= f.text_field :title, required: true %>
-      <%= f.submit "Save", class: "button" %>
-      <%= button_tag "Cancel", class: "button cancel magenta" %>
-    <% end %>
-  </div>
-<% else %>
-  <%= project.title %>
-<% end %>
-
-<div>
-  <%= version_jump_badge(project) %>
-  <span class="status-badge locked <%= "hide" if project.locked_at.nil? %>">Locked</span>
-  <span class="status-badge <%= project.status %> <%= "hide" if project.status.nil? %>"><%= project.status %></span>
-</div>
diff --git a/app/views/shared/_story.html.erb b/app/views/shared/_story.html.erb
index 301492f7..e2389af5 100644
--- a/app/views/shared/_story.html.erb
+++ b/app/views/shared/_story.html.erb
@@ -1,22 +1,2 @@
-<div class="story-title">
-  <h4 class="word-break">Story #<%= story.id %>: <%= story.title %></h4>
-  <div class="dropdown-wrapper">
-    <button class="button <%= status_color(story) %>">
-      <span><%= story.status %></span>
-      <i class="fa fa-solid fa-caret-down"></i>
-    </button>
-    <div class="dropdown">
-      <%= button_to "Approve", approve_story_path(@story), class: "status-selector", method: :patch, remote: true %>
-      <%= button_to "Reject", reject_story_path(@story), class: "status-selector", method: :patch, remote: true %>
-      <%= button_to "Pending", pending_story_path(@story), class: "status-selector", method: :patch, remote: true %>
-    </div>
-  </div>
-</div>
-
-<div class="story-description">
-  <%= markdown(story.description) %>
-</div>
-
-<div class="extra-info">
-  <%= markdown(story.extra_info) %>
-</div>
+<h1 class="story-title">Story: <%= story.title %></h1>
+<h4 class="story-description"><%= markdown(story.description) %></h4>
diff --git a/app/views/shared/update_status.js.erb b/app/views/shared/update_status.js.erb
deleted file mode 100644
index 3c4d1caf..00000000
--- a/app/views/shared/update_status.js.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-updateStatusButton("<%= status_color(@story) %>", "<%= @story.status %>");
-updateStatusLabel("<%= @story.status %>", "<%= @story.id %>")
diff --git a/app/views/stories/_form.html.erb b/app/views/stories/_form.html.erb
index 2fa26d7b..50133a66 100644
--- a/app/views/stories/_form.html.erb
+++ b/app/views/stories/_form.html.erb
@@ -11,40 +11,17 @@
     </div>
   <% end %>
 
-  <%= f.hidden_field :project_id, value: params[:project_id] %>
-
-  <div class="field story_title">
+  <div class="field">
     <%= f.label :title %>
-    <%= f.text_field :title, placeholder: "Story Title", class: "project-story-title", autofocus: true %>
+    <%= f.text_field :title, placeholder: "Story Title", class: "project-story-title" %>
   </div>
 
-  <div class="field story_description">
+  <div class="field">
     <%= f.label :description, "Description (Markdown)" %>
-    <%= f.text_area :description, placeholder: "Description", class: "story-description", rows: 20, 'data-has-preview': true, 'data-preview-target': 'story_preview' %>
-  </div>
-
-  <div class="story_preview">
-    <label>Description Preview</label>
-    <div class="content"><%= markdown(@story.description) %></div>
-  </div>
-
-  <div class="field story_extra_info">
-    <%= f.label :extra_info, "Extra Info (Markdown - for context only, not added to action plan)" %>
-    <%= f.text_area :extra_info, placeholder: "Extra Indo", class: "story-extra-info", rows: 20, 'data-has-preview': true, 'data-preview-target': 'extra_info_preview' %>
-  </div>
-
-  <div class="extra_info_preview">
-    <label>Extra Info Preview</label>
-    <div class="content"><%= markdown(@story.extra_info) %></div>
-  </div>
-
-  <div class="field story_status">
-    <%= f.label :status, "Status" %>
-    <%= f.select :status, options_for_status_select(@story, action_name), class: "project-story-approved" %>
+    <%= f.text_area :description, placeholder: "Description", class: "story-description", rows: 20 %>
   </div>
 
+  <%= f.hidden_field :project_id, value: params[:project_id] %>
 
-  <div class="btn-group">
-    <%= f.submit yield(:button_text), class: "button green", id: "edit" %>
-  </div>
+  <%= f.submit yield(:button_text), class: "btn btn-lg btn-primary", id: "edit" %>
 <% end %>
diff --git a/app/views/stories/destroy.js.erb b/app/views/stories/destroy.js.erb
deleted file mode 100644
index 7ba8296e..00000000
--- a/app/views/stories/destroy.js.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-function(){}
-  document.getElementById(`story_<%= @story.id %>`).remove()
-}()
\ No newline at end of file
diff --git a/app/views/stories/edit.html.erb b/app/views/stories/edit.html.erb
index 31c67abb..e66d24ea 100644
--- a/app/views/stories/edit.html.erb
+++ b/app/views/stories/edit.html.erb
@@ -1,10 +1,8 @@
-<div class="container">
-  <h1 class="dashboard-title"><%= render "shared/project_title", project: @project %></h1>
-  <% provide(:button_text, 'Save Changes') %>
-  <h2 class="new-edit-title">Edit Story</h2>
+<% provide(:button_text, 'Save Changes') %>
+<h2 class="new-edit-title">Edit Story</h2>
 
-  <%= render 'form', story: @story %>
+<%= render 'form', story: @story %>
 
-  <hr>
-  <%= link_to 'Back', project_path(@project), id:"back", class: "button" %>
-</div>
+<hr>
+
+<%= link_to 'Back', project_path(@project.id), id:"back" %>
diff --git a/app/views/stories/new.html.erb b/app/views/stories/new.html.erb
index a7717d75..28696fb9 100644
--- a/app/views/stories/new.html.erb
+++ b/app/views/stories/new.html.erb
@@ -1,10 +1,8 @@
-<div class="container">
-  <h1 class="dashboard-title"><%= render "shared/project_title", project: @project %></h1>
-  <% provide(:button_text, 'Create') %>
-  <h2 class="new-edit-title">Create New Story</h2>
+<% provide(:button_text, 'Create') %>
+<h2 class="new-edit-title">Create New Story</h2>
 
-  <%= render 'form', story: @story %>
-  <hr>
+<%= render 'form', story: @story %>
 
-  <%= link_to 'Back', project_path(@project), id: "back", class: "button" %>
-</div>
\ No newline at end of file
+<hr>
+
+<%= link_to 'Back', project_path(@project.id), id: "back" %>
diff --git a/app/views/stories/show.html.erb b/app/views/stories/show.html.erb
index 6027b9ee..2971252f 100644
--- a/app/views/stories/show.html.erb
+++ b/app/views/stories/show.html.erb
@@ -1,25 +1,4 @@
-<div class="container">
-  <h1 class="dashboard-title"><%= render "shared/project_title", project: @project %></h1>
+<%= render "shared/story", story: @story %>
 
-  <%= render partial: "shared/story", locals: { story: @story } %>
-
-  <div class="btn-group">
-    <%= link_to 'Back', project_path(@project), id: "back", class: "button" %>
-    <% if is_unlocked?(@project) %>
-      <%= link_unless_archived(@project, "Edit", edit_project_story_path(@project), classes: "magenta", id: "back") %>
-      <%= link_to "Delete", project_story_path(@project.id, @story), method: :delete, data: { confirm: "Are you sure?", story_id: @story.id }, class: "button red", remote: true , title: "Delete" %>
-    <% end %>
-  </div>
-
-  <div class="comments-section">
-    <h4>Comments</h4>
-    <% @comments.each do |comment| %>
-      <%= render partial: "comments/comment", locals: { story: @story, project: @project, comment: comment } %>
-    <% end %>
-  </div>
-
-  <div class="comment-form-container">
-    <p class="bold">Add a new comment</p>
-    <%= render partial: "comments/form", locals: { story: @story, project: @project, comment: @comment } %>
-  </div>
-</div>
+<%= link_to 'Edit', edit_project_story_path(@project.id), id:"back" %> |
+<%= link_to 'Back', project_path(@project.id), id:"back" %>
diff --git a/bin/bundle b/bin/bundle
index fe187450..66e9889e 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
-load Gem.bin_path("bundler", "bundle")
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/rails b/bin/rails
index 40d2d5e1..5badb2fd 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 begin
-  load File.expand_path("../spring", __FILE__)
+  load File.expand_path('../spring', __FILE__)
 rescue LoadError => e
-  raise unless e.message.include?("spring")
+  raise unless e.message.include?('spring')
 end
-APP_PATH = File.expand_path("../config/application", __dir__)
-require_relative "../config/boot"
-require "rails/commands"
+APP_PATH = File.expand_path('../config/application', __dir__)
+require_relative '../config/boot'
+require 'rails/commands'
diff --git a/bin/rake b/bin/rake
index 3df5805b..d87d5f57 100755
--- a/bin/rake
+++ b/bin/rake
@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 begin
-  load File.expand_path("../spring", __FILE__)
+  load File.expand_path('../spring', __FILE__)
 rescue LoadError => e
-  raise unless e.message.include?("spring")
+  raise unless e.message.include?('spring')
 end
-require_relative "../config/boot"
-require "rake"
+require_relative '../config/boot'
+require 'rake'
 Rake.application.run
diff --git a/bin/setup b/bin/setup
index f65bdc52..572e0050 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
-require "pathname"
-require "fileutils"
+require 'pathname'
+require 'fileutils'
 include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path("../../", __FILE__)
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -14,34 +14,34 @@ chdir APP_ROOT do
   # This script is a starting point to setup your application.
   # Add necessary setup steps to this file.
 
-  puts "== Installing dependencies =="
-  system! "gem install bundler -v 2.2.26 --conservative"
-  system("bundle check") || system!("bundle install")
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
 
   # Install JavaScript dependencies if using Yarn
   # system('bin/yarn')
 
   puts "\n== Copying sample files =="
-  unless File.exist?("config/database.yml")
-    cp "config/database.yml.sample", "config/database.yml"
+  unless File.exist?('config/database.yml')
+    cp 'config/database.yml.sample', 'config/database.yml'
   end
 
-  unless File.exist?(".env")
-    cp ".env.sample", ".env"
+  puts "\n== Copying ruby version =="
+  unless File.exist?('.ruby-version')
+    cp '.ruby-version.sample', '.ruby-version'
+  end
+
+  unless File.exist?('.env')
+    cp '.env.sample', '.env'
     puts "\n\e[93m=== IMPORTANT: Make sure you fill out details in .env\033[0m"
   end
 
   puts "\n== Preparing database =="
-  system! "bin/rails db:setup"
-  system! "bin/rails db:seed"
+  system! 'bin/rails db:setup'
 
   puts "\n== Removing old logs and tempfiles =="
-  system! "bin/rails log:clear tmp:clear"
-
-  puts "\n== Adding pre-commit hook =="
-  system! "cp .pre-commit .git/hooks/pre-commit"
-  system! "chmod +x .git/hooks/pre-commit"
+  system! 'bin/rails log:clear tmp:clear'
 
   puts "\n== Restarting application server =="
-  system! "bin/rails restart"
+  system! 'bin/rails restart'
 end
diff --git a/bin/setup_with_docker b/bin/setup_with_docker
deleted file mode 100755
index 07f134cd..00000000
--- a/bin/setup_with_docker
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env ruby
-require "pathname"
-require "fileutils"
-include FileUtils
-
-# path to your application root.
-APP_ROOT = Pathname.new File.expand_path("../../", __FILE__)
-
-def system!(*args)
-  system(*args) || abort("\n== Command #{args} failed ==")
-end
-
-DOCKER_PREFIX = "docker-compose run --rm web "
-
-chdir APP_ROOT do
-  puts "== Copy .env =="
-  unless File.exist?(".env")
-    cp ".env.sample", ".env"
-  end
-
-  puts "== Build container =="
-  system! "docker-compose build"
-
-  puts "== Configuring app  =="
-  unless File.exist?("config/database.yml")
-    puts "\n== Copying sample files =="
-    cp "config/database.yml.sample", "config/database.yml"
-  end
-
-  puts "\n== Setting up the database  =="
-  system! "#{DOCKER_PREFIX} rails db:setup"
-
-  puts "== Install yarn packages =="
-  system! "#{DOCKER_PREFIX} yarn install"
-
-  puts "== Configuration finished successfully!! =="
-end
-
diff --git a/bin/spring b/bin/spring
index b44ad1a7..fb2ec2eb 100755
--- a/bin/spring
+++ b/bin/spring
@@ -4,14 +4,14 @@
 # It gets overwritten when you run the `spring binstub` command.
 
 unless defined?(Spring)
-  require "rubygems"
-  require "bundler"
+  require 'rubygems'
+  require 'bundler'
 
   lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
   spring = lockfile.specs.detect { |spec| spec.name == "spring" }
   if spring
     Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
-    gem "spring", spring.version
-    require "spring/binstub"
+    gem 'spring', spring.version
+    require 'spring/binstub'
   end
 end
diff --git a/bin/start_with_docker b/bin/start_with_docker
deleted file mode 100755
index 3a7f9d72..00000000
--- a/bin/start_with_docker
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-docker-compose up -d web && docker attach $(docker-compose ps -q web)
-
diff --git a/bin/update b/bin/update
index 770b8406..a8e4462f 100755
--- a/bin/update
+++ b/bin/update
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
-require "pathname"
-require "fileutils"
+require 'pathname'
+require 'fileutils'
 include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path("../../", __FILE__)
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -14,16 +14,16 @@ chdir APP_ROOT do
   # This script is a way to update your development environment automatically.
   # Add necessary update steps to this file.
 
-  puts "== Installing dependencies =="
-  system! "gem install bundler --conservative"
-  system("bundle check") || system!("bundle install")
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
 
   puts "\n== Updating database =="
-  system! "bin/rails db:migrate"
+  system! 'bin/rails db:migrate'
 
   puts "\n== Removing old logs and tempfiles =="
-  system! "bin/rails log:clear tmp:clear"
+  system! 'bin/rails log:clear tmp:clear'
 
   puts "\n== Restarting application server =="
-  system! "bin/rails restart"
+  system! 'bin/rails restart'
 end
diff --git a/bin/yarn b/bin/yarn
index 16c57f06..c2bacef8 100755
--- a/bin/yarn
+++ b/bin/yarn
@@ -1,9 +1,11 @@
 #!/usr/bin/env ruby
-VENDOR_PATH = File.expand_path("..", __dir__)
+VENDOR_PATH = File.expand_path('..', __dir__)
 Dir.chdir(VENDOR_PATH) do
-  exec "yarnpkg #{ARGV.join(" ")}"
-rescue Errno::ENOENT
-  warn "Yarn executable was not detected in the system."
-  warn "Download Yarn at https://yarnpkg.com/en/docs/install"
-  exit 1
+  begin
+    exec "yarnpkg #{ARGV.join(" ")}"
+  rescue Errno::ENOENT
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
 end
diff --git a/config.ru b/config.ru
index 441e6ff0..f7ba0b52 100644
--- a/config.ru
+++ b/config.ru
@@ -1,5 +1,5 @@
 # This file is used by Rack-based servers to start the application.
 
-require_relative "config/environment"
+require_relative 'config/environment'
 
 run Rails.application
diff --git a/config/application.rb b/config/application.rb
index cf756c2b..a6622a67 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,6 +1,6 @@
-require_relative "boot"
+require_relative 'boot'
 
-require "rails/all"
+require 'rails/all'
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -9,7 +9,7 @@
 module Points
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 7.1
+    config.load_defaults 5.1
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
diff --git a/config/boot.rb b/config/boot.rb
index 28201161..30f5120d 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,3 +1,3 @@
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
-require "bundler/setup" # Set up gems listed in the Gemfile.
+require 'bundler/setup' # Set up gems listed in the Gemfile.
diff --git a/config/database.yml.sample b/config/database.yml.sample
index 378d8d35..609baa3f 100644
--- a/config/database.yml.sample
+++ b/config/database.yml.sample
@@ -9,13 +9,12 @@ default: &default
   encoding: unicode
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   timeout: 5000
-  username: <%= ENV.fetch("POSTGRES_USER") { `echo $USER`} %>
-  password: <%= ENV.fetch("POSTGRES_PASSWORD") { "" } %>
-  host: <%= ENV.fetch("POSTGRES_HOST") { "" } %>
+  host: localhost
+  username: <%= `echo $USER` %>
 
 development:
   <<: *default
-  database: <%= ENV.fetch("POINTS_DB_NAME") { "points-development" } %>
+  database: points-development
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
diff --git a/config/environment.rb b/config/environment.rb
index cac53157..426333bb 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,5 @@
 # Load the Rails application.
-require_relative "application"
+require_relative 'application'
 
 # Initialize the Rails application.
 Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index bf8b8ea6..1fa49252 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,6 +1,6 @@
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
-  config.action_mailer.default_url_options = {host: "localhost", port: 3000}
+  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
@@ -13,12 +13,12 @@
   config.consider_all_requests_local = true
 
   # Enable/disable caching. By default caching is disabled.
-  if Rails.root.join("tmp/caching-dev.txt").exist?
+  if Rails.root.join('tmp/caching-dev.txt').exist?
     config.action_controller.perform_caching = true
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
-      "Cache-Control" => "public, max-age=#{2.days.seconds.to_i}"
+      'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}"
     }
   else
     config.action_controller.perform_caching = false
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 4c55e4e7..5b75be1b 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -11,7 +11,7 @@
   config.eager_load = true
 
   # Full error reports are disabled and caching is turned on.
-  config.consider_all_requests_local = false
+  config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
   # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
@@ -21,10 +21,11 @@
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
+  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
-  config.assets.css_compressor = :sass
-  config.assets.js_compressor = :terser
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
@@ -44,15 +45,14 @@
   # config.action_cable.allowed_request_origins = [ 'http://example.com', /https:\/\/round-lake.dustinice.workers.dev:443\/http\/example.*/ ]
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  config.force_ssl = true
-  config.ssl_options = {redirect: {status: 301}}
+  # config.force_ssl = true
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.
   config.log_level = :debug
 
   # Prepend all log lines with the following tags.
-  config.log_tags = [:request_id]
+  config.log_tags = [ :request_id ]
 
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
@@ -81,9 +81,9 @@
   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
 
   if ENV["RAILS_LOG_TO_STDOUT"].present?
-    logger = ActiveSupport::Logger.new($stdout)
+    logger           = ActiveSupport::Logger.new(STDOUT)
     logger.formatter = config.log_formatter
-    config.logger = ActiveSupport::TaggedLogging.new(logger)
+    config.logger    = ActiveSupport::TaggedLogging.new(logger)
   end
 
   # Do not dump schema after migrations.
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 8f5f973f..8e5cbde5 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -15,11 +15,11 @@
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
-    "Cache-Control" => "public, max-age=#{1.hour.seconds.to_i}"
+    'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}"
   }
 
   # Show full error reports and disable caching.
-  config.consider_all_requests_local = true
+  config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
   # Raise exceptions instead of rendering exception templates.
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 9339eb01..4b828e80 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -1,12 +1,12 @@
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = "1.0"
+Rails.application.config.assets.version = '1.0'
 
 # Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
 # Add Yarn node_modules folder to the asset load path.
-Rails.application.config.assets.paths << Rails.root.join("node_modules", "vendor")
+Rails.application.config.assets.paths << Rails.root.join('node_modules')
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
new file mode 100644
index 00000000..eabf38f8
--- /dev/null
+++ b/config/initializers/devise.rb
@@ -0,0 +1,283 @@
+# frozen_string_literal: true
+
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
+Devise.setup do |config|
+  # The secret key used by Devise. Devise uses this key to generate
+  # random tokens. Changing this key will render invalid all existing
+  # confirmation, reset password and unlock tokens in the database.
+  # Devise will use the `secret_key_base` as its `secret_key`
+  # by default. You can change it below and use your own secret key.
+  # config.secret_key = 'b292df243ce814666d975f6fbaf7e120a6614d3e921f631342f58d64219c97a85b819a2534a938e8287a8a4f6529b87fffa1716da56cecfee05d739fa115d432'
+
+  # ==> Controller configuration
+  # Configure the parent class to the devise controllers.
+  # config.parent_controller = 'DeviseController'
+
+  # ==> Mailer Configuration
+  # 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 = 'please-change-me-at-config-initializers-devise@example.com'
+
+  # Configure the class responsible to send e-mails.
+  # config.mailer = 'Devise::Mailer'
+
+  # Configure the parent class responsible to send e-mails.
+  # config.parent_mailer = 'ActionMailer::Base'
+
+  # ==> ORM configuration
+  # Load and configure the ORM. Supports :active_record (default) and
+  # :mongoid (bson_ext recommended) by default. Other ORMs may be
+  # available as additional gems.
+  require 'devise/orm/active_record'
+
+  # ==> Configuration for any authentication mechanism
+  # Configure which keys are used when authenticating a user. The default is
+  # just :email. You can configure it to use [:username, :subdomain], so for
+  # authenticating a user, both parameters are required. Remember that those
+  # parameters are used only when authenticating and not when retrieving from
+  # session. If you need permissions, you should implement that in a before filter.
+  # You can also supply a hash where the value is a boolean determining whether
+  # or not authentication should be aborted when the value is not present.
+  # config.authentication_keys = [:email]
+
+  # Configure parameters from the request object used for authentication. Each entry
+  # given should be a request method and it will automatically be passed to the
+  # find_for_authentication method and considered in your model lookup. For instance,
+  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+  # The same considerations mentioned for authentication_keys also apply to request_keys.
+  # config.request_keys = []
+
+  # Configure which authentication keys should be case-insensitive.
+  # These keys will be downcased upon creating or modifying a user and when used
+  # to authenticate or find a user. Default is :email.
+  config.case_insensitive_keys = [:email]
+
+  # Configure which authentication keys should have whitespace stripped.
+  # These keys will have whitespace before and after removed upon creating or
+  # modifying a user and when used to authenticate or find a user. Default is :email.
+  config.strip_whitespace_keys = [:email]
+
+  # Tell if authentication through request.params is enabled. True by default.
+  # It can be set to an array that will enable params authentication only for the
+  # given strategies, for example, `config.params_authenticatable = [:database]` will
+  # enable it only for database (email + password) authentication.
+  # config.params_authenticatable = true
+
+  # Tell if authentication through HTTP Auth is enabled. False by default.
+  # It can be set to an array that will enable http authentication only for the
+  # given strategies, for example, `config.http_authenticatable = [:database]` will
+  # enable it only for database authentication. The supported strategies are:
+  # :database      = Support basic authentication with authentication key + password
+  # config.http_authenticatable = false
+
+  # If 401 status code should be returned for AJAX requests. True by default.
+  # config.http_authenticatable_on_xhr = true
+
+  # The realm used in Http Basic Authentication. 'Application' by default.
+  # config.http_authentication_realm = 'Application'
+
+  # It will change confirmation, password recovery and other workflows
+  # to behave the same regardless if the e-mail provided was right or wrong.
+  # Does not affect registerable.
+  # config.paranoid = true
+
+  # By default Devise will store the user in session. You can skip storage for
+  # particular strategies by setting this option.
+  # Notice that if you are skipping storage for all authentication paths, you
+  # may want to disable generating routes to Devise's sessions controller by
+  # passing skip: :sessions to `devise_for` in your config/routes.rb
+  config.skip_session_storage = [:http_auth]
+
+  # By default, Devise cleans up the CSRF token on authentication to
+  # avoid CSRF token fixation attacks. This means that, when using AJAX
+  # requests for sign in and sign up, you need to get a new CSRF token
+  # from the server. You can disable this option at your own risk.
+  # config.clean_up_csrf_token_on_authentication = true
+
+  # When false, Devise will not attempt to reload routes on eager load.
+  # This can reduce the time taken to boot the app but if your application
+  # requires the Devise mappings to be loaded during boot time the application
+  # won't boot properly.
+  # config.reload_routes = true
+
+  # ==> Configuration for :database_authenticatable
+  # For bcrypt, this is the cost for hashing the password and defaults to 11. If
+  # using other algorithms, it sets how many times you want the password to be hashed.
+  #
+  # Limiting the stretches to just one in testing will increase the performance of
+  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+  # a value less than 10 in other environments. Note that, for bcrypt (the default
+  # algorithm), the cost increases exponentially with the number of stretches (e.g.
+  # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
+  config.stretches = Rails.env.test? ? 1 : 11
+
+  # Set up a pepper to generate the hashed password.
+  # config.pepper = 'b730f055d42e62ba0d1f795ea0cb9926843b41cd8b4fec5c059d6b5173891416ca2e6bf7a9ad96d59f5e2e07f6c89adf66c822094b4bae834289978958af4a19'
+
+  # Send a notification to the original email when the user's email is changed.
+  # config.send_email_changed_notification = false
+
+  # Send a notification email when the user's password is changed.
+  # config.send_password_change_notification = false
+
+  # ==> Configuration for :confirmable
+  # A period that the user is allowed to access the website even without
+  # confirming their account. For instance, if set to 2.days, the user will be
+  # able to access the website for two days without confirming their account,
+  # access will be blocked just in the third day. Default is 0.days, meaning
+  # the user cannot access the website without confirming their account.
+  # config.allow_unconfirmed_access_for = 2.days
+
+  # A period that the user is allowed to confirm their account before their
+  # token becomes invalid. For example, if set to 3.days, the user can confirm
+  # their account within 3 days after the mail was sent, but on the fourth day
+  # their account can't be confirmed with the token any more.
+  # Default is nil, meaning there is no restriction on how long a user can take
+  # before confirming their account.
+  # config.confirm_within = 3.days
+
+  # If true, requires any email changes to be confirmed (exactly the same way as
+  # initial account confirmation) to be applied. Requires additional unconfirmed_email
+  # db field (see migrations). Until confirmed, new email is stored in
+  # unconfirmed_email column, and copied to email column on successful confirmation.
+  config.reconfirmable = true
+
+  # Defines which key will be used when confirming an account
+  # config.confirmation_keys = [:email]
+
+  # ==> Configuration for :rememberable
+  # The time the user will be remembered without asking for credentials again.
+  # config.remember_for = 2.weeks
+
+  # Invalidates all the remember me tokens when the user signs out.
+  config.expire_all_remember_me_on_sign_out = true
+
+  # If true, extends the user's remember period when remembered via cookie.
+  # config.extend_remember_period = false
+
+  # Options to be passed to the created cookie. For instance, you can set
+  # secure: true in order to force SSL only cookies.
+  # config.rememberable_options = {}
+
+  # ==> Configuration for :validatable
+  # Range for password length.
+  config.password_length = 6..128
+
+  # Email regex used to validate email formats. It simply asserts that
+  # one (and only one) @ exists in the given string. This is mainly
+  # to give user feedback and not to assert the e-mail validity.
+  config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
+
+  # ==> Configuration for :timeoutable
+  # The time you want to timeout the user session without activity. After this
+  # time the user will be asked for credentials again. Default is 30 minutes.
+  # config.timeout_in = 30.minutes
+
+  # ==> Configuration for :lockable
+  # Defines which strategy will be used to lock an account.
+  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+  # :none            = No lock strategy. You should handle locking by yourself.
+  # config.lock_strategy = :failed_attempts
+
+  # Defines which key will be used when locking and unlocking an account
+  # config.unlock_keys = [:email]
+
+  # Defines which strategy will be used to unlock an account.
+  # :email = Sends an unlock link to the user email
+  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
+  # :both  = Enables both strategies
+  # :none  = No unlock strategy. You should handle unlocking by yourself.
+  # config.unlock_strategy = :both
+
+  # Number of authentication tries before locking an account if lock_strategy
+  # is failed attempts.
+  # config.maximum_attempts = 20
+
+  # Time interval to unlock the account if :time is enabled as unlock_strategy.
+  # config.unlock_in = 1.hour
+
+  # Warn on the last attempt before the account is locked.
+  # config.last_attempt_warning = true
+
+  # ==> Configuration for :recoverable
+  #
+  # Defines which key will be used when recovering the password for an account
+  # config.reset_password_keys = [:email]
+
+  # Time interval you can reset your password with a reset password key.
+  # Don't put a too small interval or your users won't have the time to
+  # change their passwords.
+  config.reset_password_within = 6.hours
+
+  # When set to false, does not sign a user in automatically after their password is
+  # reset. Defaults to true, so a user is signed in automatically after a reset.
+  # config.sign_in_after_reset_password = true
+
+  # ==> Configuration for :encryptable
+  # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
+  # You can use :sha1, :sha512 or algorithms from others authentication tools as
+  # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
+  # for default behavior) and :restful_authentication_sha1 (then you should set
+  # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
+  #
+  # Require the `devise-encryptable` gem when using anything other than bcrypt
+  # config.encryptor = :sha512
+
+  # ==> Scopes configuration
+  # Turn scoped views on. Before rendering "sessions/new", it will first check for
+  # "users/sessions/new". It's turned off by default because it's slower if you
+  # are using only default views.
+  # config.scoped_views = false
+
+  # Configure the default scope given to Warden. By default it's the first
+  # devise role declared in your routes (usually :user).
+  # config.default_scope = :user
+
+  # Set this configuration to false if you want /users/sign_out to sign out
+  # only the current scope. By default, Devise signs out all scopes.
+  # config.sign_out_all_scopes = true
+
+  # ==> Navigation configuration
+  # Lists the formats that should be treated as navigational. Formats like
+  # :html, should redirect to the sign in page when the user does not have
+  # access, but formats like :xml or :json, should return 401.
+  #
+  # If you have any extra navigational formats, like :iphone or :mobile, you
+  # should add them to the navigational formats lists.
+  #
+  # The "*/*" below is required to match Internet Explorer requests.
+  # config.navigational_formats = ['*/*', :html]
+
+  # The default HTTP method used to sign out a resource. Default is :delete.
+  config.sign_out_via = :delete
+
+  # ==> OmniAuth
+  # Add a new OmniAuth provider. Check the wiki for more information on setting
+  # up on your models and hooks.
+  config.omniauth :github, ENV['GITHUB_APP_ID'], ENV['GITHUB_APP_SECRET'], scope: 'user:email'
+
+  # ==> Warden configuration
+  # If you want to use other strategies, that are not supported by Devise, or
+  # change the failure app, you can configure them inside the config.warden block.
+  #
+  # config.warden do |manager|
+  #   manager.intercept_401 = false
+  #   manager.default_strategies(scope: :user).unshift :some_external_strategy
+  # end
+
+  # ==> Mountable engine configurations
+  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+  # is mountable, there are some extra configurations to be taken into account.
+  # The following options are available, assuming the engine is mounted as:
+  #
+  #     mount MyEngine, at: '/my_engine'
+  #
+  # The router that invoked `devise_for`, in the example above, would be:
+  # config.router_name = :my_engine
+  #
+  # When using OmniAuth, Devise cannot automatically set OmniAuth path,
+  # so you need to do it manually. For the users scope, it would be:
+  # config.omniauth_path_prefix = '/my_engine/users/auth'
+end
diff --git a/config/initializers/rack_mini_profiler.rb b/config/initializers/rack_mini_profiler.rb
deleted file mode 100644
index 26437779..00000000
--- a/config/initializers/rack_mini_profiler.rb
+++ /dev/null
@@ -1 +0,0 @@
-Rack::MiniProfiler.config.authorization_mode = :allow_authorized
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
deleted file mode 100644
index 49163708..00000000
--- a/config/initializers/sentry.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-if Rails.env.production?
-  Sentry.init do |config|
-    config.dsn = ENV["SENTRY_DSN"]
-    config.breadcrumbs_logger = [:active_support_logger, :http_logger]
-
-    # Set traces_sample_rate to 1.0 to capture 100%
-    # of transactions for tracing.
-    # We recommend adjusting this value in production.
-    config.traces_sample_rate = 1.0
-    # or
-    config.traces_sampler = lambda do |context|
-      true
-    end
-    # Set profiles_sample_rate to profile 100%
-    # of sampled transactions.
-    # We recommend adjusting this value in production.
-    config.profiles_sample_rate = 1.0
-  end
-end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 505ab9d0..decc5a85 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -30,8 +30,4 @@
 # available at http://guides.rubyonrails.org/i18n.html.
 
 en:
-  estimates:
-    form:
-      button_text: "Save changes"
   hello: "Hello world"
-
diff --git a/config/newrelic.yml b/config/newrelic.yml
deleted file mode 100644
index 61cf3f6c..00000000
--- a/config/newrelic.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# This file configures the New Relic Agent.  New Relic monitors Ruby, Java,
-# .NET, PHP, Python, Node, and Go applications with deep visibility and low
-# overhead.  For more information, visit www.newrelic.com.
-#
-# Generated June 14, 2022
-#
-# This configuration file is custom generated for NewRelic Administration
-#
-# For full documentation of agent configuration options, please refer to
-# https://docs.newrelic.com/docs/agents/ruby-agent/installation-configuration/ruby-agent-configuration
-
-common:
-  &default_settings # Required license key associated with your New Relic account.
-  license_key: <%= ENV["NEW_RELIC_LICENSE_KEY"] %>
-
-  # Your application name. Renaming here affects where data displays in New
-  # Relic.  For more details, see https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/renaming-applications
-  app_name: Points
-
-  distributed_tracing:
-    enabled: true
-
-  # To disable the agent regardless of other settings, uncomment the following:
-  # agent_enabled: false
-
-  # Logging level for log/newrelic_agent.log
-  log_level: info
-
-  application_logging:
-    # If `true`, all logging-related features for the agent can be enabled or disabled
-    # independently. If `false`, all logging-related features are disabled.
-    enabled: true
-    forwarding:
-      # If `true`, the agent captures log records emitted by this application.
-      enabled: true
-      # Defines the maximum number of log records to buffer in memory at a time.
-      max_samples_stored: 10000
-    metrics:
-      # If `true`, the agent captures metrics related to logging for this application.
-      enabled: true
-    local_decorating:
-      # If `true`, the agent decorates logs with metadata to link to entities, hosts, traces, and spans.
-      # This requires a log forwarder to send your log files to New Relic.
-      # This should not be used when forwarding is enabled.
-      enabled: false
-
-production:
-  <<: *default_settings
diff --git a/config/puma.rb b/config/puma.rb
index 3a4feda1..1e19380d 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -4,12 +4,12 @@
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # and maximum; this matches the default thread size of Active Record.
 #
-threads_count = ENV.fetch("RAILS_MAX_THREADS", 5)
+threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
 threads threads_count, threads_count
 
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #
-port ENV.fetch("PORT", 3000)
+port        ENV.fetch("PORT") { 3000 }
 
 # Specifies the `environment` that Puma will run in.
 #
diff --git a/config/routes.rb b/config/routes.rb
index c54e79e6..822280a1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,54 +1,30 @@
 Rails.application.routes.draw do
-  draw :madmin
 
-  mount OmbuLabs::Auth::Engine, at: "/", as: "ombu_labs_auth"
+  devise_for :users, controllers: { omniauth_callbacks: 'callbacks' }
 
   authenticated do
-    root to: "projects#index", as: :authenticated_root
+    root :to => 'projects#index'
   end
 
-  root to: "home#index"
-  get "home/index"
-  get "reports/index"
+  root :to => 'home#index'
+  get 'home/index'
+  get 'reports/index'
 
-  resources :stories do
-    member do
-      patch :approve
-      patch :reject
-      patch :pending
-    end
-
-    collection do
-      post :bulk_destroy, to: "stories#bulk_destroy"
-      post :render_markdown
-    end
+  resource :stories do
+    post :bulk_destroy, to: 'stories#bulk_destroy'
   end
 
   resources :projects do
-    member do
-      patch :sort
-      patch :sort_stories
-      patch :toggle_archive
-      patch :toggle_locked
-      get :new_clone
-      post :clone
-      get :open_delete_modal
-    end
-    get :new_sub_project
+    patch :sort, on: :member
 
-    resource :report do
-      get "download", to: "reports#download"
-    end
+    resource :report
 
     resources :stories do
-      get :real_scores, on: :collection, to: "real_scores#edit"
-      patch :real_scores, on: :collection, to: "real_scores#update"
+      get :real_scores, on: :collection, to: 'real_scores#edit'
+      patch :real_scores, on: :collection, to: 'real_scores#update'
       patch :import, on: :collection
       get :export, on: :collection
-      resources :estimates, except: [:index, :show]
-      put :move
-      resources :comments, only: [:create, :edit, :update, :destroy]
+      resources :estimates
     end
-    resource :action_plan, only: [:show]
   end
 end
diff --git a/config/routes/madmin.rb b/config/routes/madmin.rb
deleted file mode 100644
index 85982206..00000000
--- a/config/routes/madmin.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# Below are the routes for madmin
-namespace :madmin do
-  resources :projects, except: [:update, :edit, :create]
-  resources :stories
-  resources :estimates, except: [:update, :edit, :create]
-  resources :users, except: [:update, :edit, :create]
-  resources :version_jumps
-  root to: "dashboard#show"
-end
diff --git a/config/spring.rb b/config/spring.rb
index 9fa7863f..c9119b40 100644
--- a/config/spring.rb
+++ b/config/spring.rb
@@ -1,6 +1,6 @@
-%w[
+%w(
   .ruby-version
   .rbenv-vars
   tmp/restart.txt
   tmp/caching-dev.txt
-].each { |path| Spring.watch(path) }
+).each { |path| Spring.watch(path) }
diff --git a/config/storage.yml b/config/storage.yml
deleted file mode 100644
index d32f76e8..00000000
--- a/config/storage.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-test:
-  service: Disk
-  root: <%= Rails.root.join("tmp/storage") %>
-
-local:
-  service: Disk
-  root: <%= Rails.root.join("storage") %>
-
-# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
-# amazon:
-#   service: S3
-#   access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
-#   secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
-#   region: us-east-1
-#   bucket: your_own_bucket
-
-# Remember not to checkin your GCS keyfile to a repository
-# google:
-#   service: GCS
-#   project: your_project
-#   credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
-#   bucket: your_own_bucket
-
-# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
-# microsoft:
-#   service: AzureStorage
-#   storage_account_name: your_account_name
-#   storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
-#   container: your_container_name
-
-# mirror:
-#   service: Mirror
-#   primary: local
-#   mirrors: [ amazon, google, microsoft ]
diff --git a/db/migrate/20180530174255_devise_create_users.rb b/db/migrate/20180530174255_devise_create_users.rb
index 9f6d239d..d9959b39 100644
--- a/db/migrate/20180530174255_devise_create_users.rb
+++ b/db/migrate/20180530174255_devise_create_users.rb
@@ -4,22 +4,22 @@ class DeviseCreateUsers < ActiveRecord::Migration[5.1]
   def change
     create_table :users do |t|
       ## Database authenticatable
-      t.string :email, null: false, default: ""
+      t.string :email,              null: false, default: ""
       t.string :encrypted_password, null: false, default: ""
 
       ## Recoverable
-      t.string :reset_password_token
+      t.string   :reset_password_token
       t.datetime :reset_password_sent_at
 
       ## Rememberable
       t.datetime :remember_created_at
 
       ## Trackable
-      t.integer :sign_in_count, default: 0, null: false
+      t.integer  :sign_in_count, default: 0, null: false
       t.datetime :current_sign_in_at
       t.datetime :last_sign_in_at
-      t.inet :current_sign_in_ip
-      t.inet :last_sign_in_ip
+      t.inet     :current_sign_in_ip
+      t.inet     :last_sign_in_ip
 
       ## Confirmable
       # t.string   :confirmation_token
@@ -32,10 +32,11 @@ def change
       # t.string   :unlock_token # Only if unlock strategy is :email or :both
       # t.datetime :locked_at
 
+
       t.timestamps null: false
     end
 
-    add_index :users, :email, unique: true
+    add_index :users, :email,                unique: true
     add_index :users, :reset_password_token, unique: true
     # add_index :users, :confirmation_token,   unique: true
     # add_index :users, :unlock_token,         unique: true
diff --git a/db/migrate/20190926190608_add_real_score_to_stories.rb b/db/migrate/20190926190608_add_real_score_to_stories.rb
index 30df3b26..a060b7de 100644
--- a/db/migrate/20190926190608_add_real_score_to_stories.rb
+++ b/db/migrate/20190926190608_add_real_score_to_stories.rb
@@ -1,5 +1,5 @@
 class AddRealScoreToStories < ActiveRecord::Migration[5.1]
   def change
-    add_column :stories, :real_score, :integer, default: nil
+    add_column :stories, :real_score, :integer
   end
 end
diff --git a/db/migrate/20210201161014_add_parent_id_to_project.rb b/db/migrate/20210201161014_add_parent_id_to_project.rb
deleted file mode 100644
index 42da473f..00000000
--- a/db/migrate/20210201161014_add_parent_id_to_project.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddParentIdToProject < ActiveRecord::Migration[5.1]
-  def change
-    add_column :projects, :parent_id, :integer, default: nil
-  end
-end
diff --git a/db/migrate/20211209170501_add_position_to_project.rb b/db/migrate/20211209170501_add_position_to_project.rb
deleted file mode 100644
index c7d055de..00000000
--- a/db/migrate/20211209170501_add_position_to_project.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddPositionToProject < ActiveRecord::Migration[6.1]
-  def change
-    add_column :projects, :position, :integer
-  end
-end
diff --git a/db/migrate/20220312201424_add_extra_info_to_stories.rb b/db/migrate/20220312201424_add_extra_info_to_stories.rb
deleted file mode 100644
index 3f0a474d..00000000
--- a/db/migrate/20220312201424_add_extra_info_to_stories.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddExtraInfoToStories < ActiveRecord::Migration[6.1]
-  def change
-    add_column :stories, :extra_info, :string
-  end
-end
diff --git a/db/migrate/20220621141342_add_locked_to_projects.rb b/db/migrate/20220621141342_add_locked_to_projects.rb
deleted file mode 100644
index 1cbb4308..00000000
--- a/db/migrate/20220621141342_add_locked_to_projects.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddLockedToProjects < ActiveRecord::Migration[6.1]
-  def change
-    add_column :projects, :locked_at, :datetime
-  end
-end
diff --git a/db/migrate/20230829001347_add_status_to_stories.rb b/db/migrate/20230829001347_add_status_to_stories.rb
deleted file mode 100644
index 39acb5fc..00000000
--- a/db/migrate/20230829001347_add_status_to_stories.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddStatusToStories < ActiveRecord::Migration[7.0]
-  def change
-    add_column :stories, :status, :integer, default: 0
-  end
-end
diff --git a/db/migrate/20230830143908_create_version_jumps.rb b/db/migrate/20230830143908_create_version_jumps.rb
deleted file mode 100644
index 0861eb3b..00000000
--- a/db/migrate/20230830143908_create_version_jumps.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class CreateVersionJumps < ActiveRecord::Migration[7.0]
-  def change
-    create_table :version_jumps do |t|
-      t.string :technology
-      t.string :initial_version
-      t.string :target_version
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20230831175732_add_version_jump_to_projects.rb b/db/migrate/20230831175732_add_version_jump_to_projects.rb
deleted file mode 100644
index 18c0a8f1..00000000
--- a/db/migrate/20230831175732_add_version_jump_to_projects.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddVersionJumpToProjects < ActiveRecord::Migration[7.0]
-  def change
-    add_reference :projects, :version_jump
-  end
-end
diff --git a/db/migrate/20230908142819_create_comments.rb b/db/migrate/20230908142819_create_comments.rb
deleted file mode 100644
index 7f1210e5..00000000
--- a/db/migrate/20230908142819_create_comments.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class CreateComments < ActiveRecord::Migration[7.0]
-  def change
-    create_table :comments do |t|
-      t.text :body
-      t.integer :story_id
-      t.integer :user_id
-      t.timestamps
-    end
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 7f61a904..a22efd82 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -2,72 +2,58 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# This file is the source Rails uses to define your schema when running `bin/rails
-# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
-# be faster and is potentially less error prone than running all of your
-# migrations from scratch. Old migrations may fail to apply correctly if those
-# migrations use external dependencies or application code.
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_09_08_142819) do
+ActiveRecord::Schema.define(version: 20190926190608) do
+
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-  create_table "comments", force: :cascade do |t|
-    t.text "body"
-    t.integer "story_id"
-    t.integer "user_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
   create_table "estimates", force: :cascade do |t|
     t.integer "best_case_points"
     t.integer "worst_case_points"
     t.integer "user_id"
     t.integer "story_id"
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "projects", force: :cascade do |t|
     t.string "title"
     t.string "status"
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
-    t.integer "parent_id"
-    t.integer "position"
-    t.datetime "locked_at", precision: nil
-    t.bigint "version_jump_id"
-    t.index ["version_jump_id"], name: "index_projects_on_version_jump_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "stories", force: :cascade do |t|
     t.string "title"
     t.text "description"
     t.integer "project_id"
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "position"
     t.integer "real_score"
-    t.string "extra_info"
-    t.integer "status", default: 0
   end
 
   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.datetime "reset_password_sent_at", precision: nil
-    t.datetime "remember_created_at", precision: nil
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
     t.integer "sign_in_count", default: 0, null: false
-    t.datetime "current_sign_in_at", precision: nil
-    t.datetime "last_sign_in_at", precision: nil
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
     t.inet "current_sign_in_ip"
     t.inet "last_sign_in_ip"
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "admin", default: false
     t.string "name"
     t.string "provider"
@@ -76,12 +62,4 @@
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
-  create_table "version_jumps", force: :cascade do |t|
-    t.string "technology"
-    t.string "initial_version"
-    t.string "target_version"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
 end
diff --git a/db/seeds.rb b/db/seeds.rb
index f97e866f..cb1d0d5a 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -5,21 +5,20 @@
 #
 #   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
 #   Character.create(name: 'Luke', movie: movies.first)
-Project.find_or_create_by(title: "Test Project")
+Project.find_or_create_by(title: 'Test Project')
+project_with_stories = Project.find_or_create_by(title: 'Test Project With Stories')
+3.times{|_| project_with_stories.stories.create} if project_with_stories.stories.count.zero?
 
-project_with_stories = Project.find_or_create_by(title: "Test Project With Stories")
-3.times { |i| project_with_stories.stories.create(title: "Story ##{i}") } if project_with_stories.stories.count.zero?
+project_with_estimates = Project.find_or_create_by(title: 'Test Project With Estimates')
+3.times{|_| project_with_estimates.stories.find_or_create_by(title: "Story ##{_}", description: "This is story ##{_}")}
 
-project_with_estimates = Project.find_or_create_by(title: "Test Project With Estimates")
-3.times { |i| project_with_estimates.stories.find_or_create_by(title: "Story ##{i}", description: "This is story ##{i}") }
+first_user = User.find_or_create_by(email: 'test1@ombulabs.com', name: 'User 1') do |user|
+  user.password = '123456'
+end
 
-first_user = User.find_or_create_by(email: "test1@ombulabs.com", name: "User 1") { |user|
-  user.password = "123456"
-}
+second_user = User.find_or_create_by(email: 'test2@ombulabs.com', name: 'User 2') do |user|
+  user.password = '123456'
+end
 
-second_user = User.find_or_create_by(email: "test2@ombulabs.com", name: "User 2") { |user|
-  user.password = "123456"
-}
-
-project_with_estimates.stories.each { |story| story.estimates.find_or_create_by(user: first_user, best_case_points: 1, worst_case_points: 5) }
-project_with_estimates.stories.each { |story| story.estimates.find_or_create_by(user: second_user, best_case_points: 1, worst_case_points: 5) }
+project_with_estimates.stories.each { |story| story.estimates.find_or_create_by(user: first_user, best_case_points: 1, worst_case_points: 5)}
+project_with_estimates.stories.each { |story| story.estimates.find_or_create_by(user: second_user, best_case_points: 1, worst_case_points: 5)}
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 3b0f9287..00000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-version: "3.9"
-
-services:
-  db:
-    image: postgres:10.9-alpine
-    environment:
-      POSTGRES_PASSWORD: password
-      POSTGRES_USER: postgres
-    volumes:
-      - db_data:/var/lib/postgresql/data
-
-  web: &web
-    build: .
-    volumes:
-      - ".:/code:delegated"
-    command: bash -c "rm -rf /code/tmp/pids && bundle exec rails s -b 0.0.0.0"
-    ports:
-      - "3000:3000"
-    depends_on:
-      - db
-    environment: &envs
-      POINTS_DB_NAME: points-development
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: password
-      POSTGRES_HOST: db
-    stdin_open: true
-    tty: true
-
-  web-next:
-    <<: *web
-    command: bash -c "rm -rf /code/tmp/pids && bundle exec rails s -b 0.0.0.0"
-    environment:
-      <<: *envs
-      BUNDLE_GEMFILE: Gemfile.next
-
-# Declare the volumes that our application uses.
-volumes:
-  db_data:
diff --git a/lib/tasks/csv_import.rake b/lib/tasks/csv_import.rake
index 5dd9f3df..e687bf77 100644
--- a/lib/tasks/csv_import.rake
+++ b/lib/tasks/csv_import.rake
@@ -1,18 +1,20 @@
 # run this like rails "csv_story_import[23,file.csv]"
 
-task :csv_story_import, [:project_id, :file] => :environment do |task, args|
-  require "csv"
+task :csv_story_import, [:project_id, :file]  => :environment  do |task, args|
+
+  require 'csv'
 
   project = Project.find(args.project_id)
   puts "this will destroy any existing stories for the project '#{project.title}'. proceed? (Y/n)"
-  response = $stdin.gets.chomp
-  exit if /n/.match?(response.downcase)
+  response = STDIN.gets.chomp
+  exit if response.downcase =~ /n/
 
   project.stories.destroy_all
 
   stories_csv = CSV.parse(File.read(args.file), headers: true)
   stories_csv.each do |story_csv|
-    project.stories.create(title: story_csv["title"], description: story_csv["description"], position: story_csv["position"])
+    project.stories.create(title: story_csv['title'], description: story_csv['description'], position: story_csv['position'])
   end
   puts "project '#{project.title}' now has #{project.stories.count} stories"
+
 end
diff --git a/megaphone_stories.csv b/megaphone_stories.csv
new file mode 100644
index 00000000..2634d16d
--- /dev/null
+++ b/megaphone_stories.csv
@@ -0,0 +1,566 @@
+Phase,subtitle,title,description,position
+Rails 4.2 to 5.0,Setup Dev Environment,Rails 4.2 to 5.0: Setup Dev Environment,"There is always some overhead setting up our development environments.
+
+It might be useful to have a Dockerfile and docker-compose.yml to work on this project. ",1
+Rails 4.2 to 5.0,Find alternative for `quiet_assets`,Rails 4.2 to 5.0: Find alternative for `quiet_assets`,"More details:
+
+```
+$ bundle exec bundle_report compatibility --rails-version=5.0.7
+                => Incompatible with Rails 5.0.7 (with new versions that are compatible):
+        These gems will need to be upgraded before upgrading to Rails 5.0.7.
+
+                devise 3.4.1 - upgrade to 4.7.0
+                flavors 0.6.0 - upgrade to 1.0.0
+                jquery-rails 2.1.4 - upgrade to 4.3.5
+                premailer-rails 1.8.2 - upgrade to 1.10.3
+                rails-dom-testing 1.0.9 - upgrade to 2.0.3
+                rails-observers 0.1.2 - upgrade to 0.1.5
+
+                        => Incompatible with Rails 5.0.7 (with no new compatible versions):
+        These gems will need to be removed or replaced before upgrading to Rails 5.0.7.
+
+                db-charmer 2.0.0.rn.dev2 (loaded from git) - new version, 1.9.1, is not compatible with Rails 5.0.7
+                prototype-rails 4.0.0 (loaded from git) - new version, 4.0.1, is not compatible with Rails 5.0.7
+                quiet_assets 1.1.0 - new version, 1.1.0, is not compatible with Rails 5.0.7
+
+                        => Incompatible with Rails 5.0.7 (with no new versions):
+        These gems will need to be upgraded by us or removed before upgrading to Rails 5.0.7.
+        This list is likely to contain internal gems, like Cuddlefish.
+
+                rin-tin-tin 0.0.1 (loaded from git) - new version not found
+
+                10 gems incompatible with Rails 5.0.7
+```",2
+Rails 4.2 to 5.0,Start using `params: { id: 123 }` in controller specs,Rails 4.2 to 5.0: Start using `params: { id: 123 }` in controller specs,"# Current
+
+Positional arguments are deprecated:
+
+```
+DEPRECATION WARNING: Using positional arguments in functional tests has been deprecated,
+         in favor of keyword arguments, and will be removed in Rails 5.1.
+```
+
+# Expected
+
+Start using `params` in controller specs.
+
+## Resources
+
+https://github.com/tjgrathwell/rails5-spec-converter",3
+Rails 4.2 to 5.0,Add ApplicationRecord to app/models,Rails 4.2 to 5.0: Add ApplicationRecord to app/models,"# Background
+
+We will need an app/models/application_record.rb:
+
+```
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end
+```
+
+The only class that inherits from ActiveRecord::Base will be ApplicationRecord.
+
+# Current
+
+All models in app/models do not extend `ApplicationRecord`
+
+# Expected
+
+All models in app/models should extend `ApplicationRecord`
+
+# References
+
+https://www.ombulabs.com/blog/rails/upgrades/upgrade-rails-from-4-2-to-5-0.html#active-record",4
+Rails 4.2 to 5.0,Create a `Gemfile.next`,Rails 4.2 to 5.0: Create a `Gemfile.next`,"# Current
+
+There is only one `Gemfile` in the project.
+
+# Expected
+
+We want to create a `Gemfile.next` so that we can start targeting a new set of dependencies based on the next version of Rails (5.0)
+
+## Resources
+
+For this we can use something like `ten_years_rails` -- See instructions here: https://fastruby.io/upgrade#6",5
+Rails 4.2 to 5.0,Setup CI to work with Gemfile.next,Rails 4.2 to 5.0: Setup CI to work with Gemfile.next,"# Current
+
+There is only one `Gemfile` in the project.
+
+# Expected
+
+We want to create a `Gemfile.next` so that we can start targeting a new set of dependencies based on the next version of Rails (5.0)
+
+## Resources
+
+For this we can use something like `ten_years_rails` -- See instructions here: https://fastruby.io/upgrade#6",6
+Rails 4.2 to 5.0,Change belongs_to associations to be optional when not required,Rails 4.2 to 5.0: Change belongs_to associations to be optional when not required,"# Background
+
+Make sure that all `belongs_to` associations look like this:
+
+```
+belongs_to :user, optional: true
+```
+
+The only exception will be if the `belongs_to` already says `required: true` as an option.
+
+# Current
+
+Some references to `belongs_to` don't explicitly mention that the relationship is optional.
+
+# Expected
+
+Explicitly define `optional: true` for all `belongs_to` associations which are not required.
+
+# References
+
+https://www.ombulabs.com/blog/rails/upgrades/upgrade-rails-from-4-2-to-5-0.html#active-record",7
+Rails 4.2 to 5.0,`bundle install` using Rails 5.0,Rails 4.2 to 5.0: `bundle install` using Rails 5.0,"# Current
+
+Bumping the version to rails 5.0 will probably fail with the current set of dependencies.
+
+# Expected
+
+Add conditionals to `Gemfile` so that we can start bundling with the next version of Rails.
+
+## Exit criteria
+
+`bundle install` should work with rails version 5.0",8
+Rails 4.2 to 5.0,Change migrations to follow new syntax,Rails 4.2 to 5.0: Change migrations to follow new syntax,"# Background
+
+Make sure that all migrations change from this:
+
+```
+class CreatePosts < ActiveRecord::Migration
+```
+
+To this:
+
+```
+class CreatePosts < ActiveRecord::Migration[4.2]
+```
+
+# Current
+
+Migrations use old Rails format.
+
+# Expected
+
+Migrations use the new format.
+
+# References
+
+https://www.ombulabs.com/blog/rails/upgrades/upgrade-rails-from-4-2-to-5-0.html#active-record",9
+Rails 4.2 to 5.0,Parameters now behave differently,Rails 4.2 to 5.0: Parameters now behave differently,Fix problems with params getting used as hashes. They no longer inherit from HashWithIndifferentAccess.,10
+Rails 4.2 to 5.0,Deprecated config.static_cache_control in favor of config.public_file_server.headers,Rails 4.2 to 5.0: Deprecated config.static_cache_control in favor of config.public_file_server.headers,,11
+Rails 4.2 to 5.0,Deprecated config.serve_static_files in favor of config.public_file_server.enabled,Rails 4.2 to 5.0: Deprecated config.serve_static_files in favor of config.public_file_server.enabled,,12
+Rails 4.2 to 5.0,"Removed respond_to and respond_with placeholder methods,this functionality has been extracted to the responders gem.","Rails 4.2 to 5.0: Removed respond_to and respond_with placeholder methods,this functionality has been extracted to the responders gem.",,13
+Rails 4.2 to 5.0,Removed assigns and assert_template. Both methods have been extracted into the rails-controller-testing gem.,Rails 4.2 to 5.0: Removed assigns and assert_template. Both methods have been extracted into the rails-controller-testing gem.,,14
+Rails 4.2 to 5.0,"Deprecated redirect_to :back in favor of redirect_back,which accepts a required fallback_location","Rails 4.2 to 5.0: Deprecated redirect_to :back in favor of redirect_back,which accepts a required fallback_location",,15
+Rails 4.2 to 5.0,Deprecated returning false as a way to halt Active Model and ActiveModel::Validations callback chains.,Rails 4.2 to 5.0: Deprecated returning false as a way to halt Active Model and ActiveModel::Validations callback chains.,The recommended way is to throw(:abort),16
+Rails 4.2 to 5.0,Start using `rails-controller-testing` gem,Rails 4.2 to 5.0: Start using `rails-controller-testing` gem,"In Rails 5.0, `assigns` have been extracted from Rails and moved to a gem.",17
+Rails 4.2 to 5.0,Fix broken build with Rails 5.0,Rails 4.2 to 5.0: Fix broken build with Rails 5.0,There will be many failures. Fix them all. ,18
+Rails 4.2 to 5.0,Address all deprecation warnings listed in the Rails 4.2 test.log,Rails 4.2 to 5.0: Address all deprecation warnings listed in the Rails 4.2 test.log,Introduce as many backwards compatible changes as possible. ,19
+Rails 4.2 to 5.0,Deploy to staging and QA,Rails 4.2 to 5.0: Deploy to staging and QA,Make sure everything works in staging. ,20
+Rails 4.2 to 5.0,Deploy to production and QA,Rails 4.2 to 5.0: Deploy to production and QA,,21
+Rails 5.0 to 5.1,`bundle install` using Rails 5.1,Rails 5.0 to 5.1: `bundle install` using Rails 5.1,"# Current
+
+Bumping the version to rails 5.1 will probably fail with the current set of dependencies.
+
+# Expected
+
+Add conditionals to `Gemfile` so that we can start bundling with the next version of Rails.
+
+## Exit criteria
+
+`bundle install` should work with rails version 5.1",22
+Rails 5.0 to 5.1,Setup dual boot in Circle CI,Rails 5.0 to 5.1: Setup dual boot in Circle CI,"# Current
+
+We are running the build using Rails 5.0
+
+# Expected
+
+We should be running the building using Rails 5.0 and Rails 5.1",23
+Rails 5.0 to 5.1,Upgrade `acts_as_paranoid`,Rails 5.0 to 5.1: Upgrade `acts_as_paranoid`,"More details:
+
+```
+$ bundle exec bundle_report compatibility --rails-version=5.1.7
+                => Incompatible with Rails 5.1.7 (with new versions that are compatible):
+        These gems will need to be upgraded before upgrading to Rails 5.1.7.
+
+                acts_as_paranoid 0.5.0 - upgrade to 0.6.0
+                devise 3.4.1 - upgrade to 4.7.0
+                flavors 0.6.0 - upgrade to 1.0.0
+                interactor-rails 2.0.2 - upgrade to 2.2.0
+                jquery-rails 2.1.4 - upgrade to 4.3.5
+                premailer-rails 1.8.2 - upgrade to 1.10.3
+                rails-dom-testing 1.0.9 - upgrade to 2.0.3
+                rails-observers 0.1.2 - upgrade to 0.1.5
+
+                        => Incompatible with Rails 5.1.7 (with no new compatible versions):
+        These gems will need to be removed or replaced before upgrading to Rails 5.1.7.
+
+                db-charmer 2.0.0.rn.dev2 (loaded from git) - new version, 1.9.1, is not compatible with Rails 5.1.7
+                prototype-rails 4.0.0 (loaded from git) - new version, 4.0.1, is not compatible with Rails 5.1.7
+                quiet_assets 1.1.0 - new version, 1.1.0, is not compatible with Rails 5.1.7
+
+                        => Incompatible with Rails 5.1.7 (with no new versions):
+        These gems will need to be upgraded by us or removed before upgrading to Rails 5.1.7.
+        This list is likely to contain internal gems, like Cuddlefish.
+
+                rin-tin-tin 0.0.1 (loaded from git) - new version not found
+
+                12 gems incompatible with Rails 5.1.7
+```",24
+Rails 5.0 to 5.1,Upgrade `interactor-rails`,Rails 5.0 to 5.1: Upgrade `interactor-rails`,"More details:
+
+```
+$ bundle exec bundle_report compatibility --rails-version=5.1.7
+                => Incompatible with Rails 5.1.7 (with new versions that are compatible):
+        These gems will need to be upgraded before upgrading to Rails 5.1.7.
+
+                acts_as_paranoid 0.5.0 - upgrade to 0.6.0
+                devise 3.4.1 - upgrade to 4.7.0
+                flavors 0.6.0 - upgrade to 1.0.0
+                interactor-rails 2.0.2 - upgrade to 2.2.0
+                jquery-rails 2.1.4 - upgrade to 4.3.5
+                premailer-rails 1.8.2 - upgrade to 1.10.3
+                rails-dom-testing 1.0.9 - upgrade to 2.0.3
+                rails-observers 0.1.2 - upgrade to 0.1.5
+
+                        => Incompatible with Rails 5.1.7 (with no new compatible versions):
+        These gems will need to be removed or replaced before upgrading to Rails 5.1.7.
+
+                db-charmer 2.0.0.rn.dev2 (loaded from git) - new version, 1.9.1, is not compatible with Rails 5.1.7
+                prototype-rails 4.0.0 (loaded from git) - new version, 4.0.1, is not compatible with Rails 5.1.7
+                quiet_assets 1.1.0 - new version, 1.1.0, is not compatible with Rails 5.1.7
+
+                        => Incompatible with Rails 5.1.7 (with no new versions):
+        These gems will need to be upgraded by us or removed before upgrading to Rails 5.1.7.
+        This list is likely to contain internal gems, like Cuddlefish.
+
+                rin-tin-tin 0.0.1 (loaded from git) - new version not found
+
+                12 gems incompatible with Rails 5.1.7
+```",25
+Rails 5.0 to 5.1,Upgrade assets configuration,Rails 5.0 to 5.1: Upgrade assets configuration,"Make the following changes to config/environments/{development, test, 	production}.rb
+From:
+config.serve_static_files = false
+config.static_cache_control = ""public, max-age=3600""
+To:
+ config.public_file_server.enabled = false
+ config.public_file_server.headers = ""public, max-age=3600""",26
+Rails 5.0 to 5.1,Change all *_filter methods to *_action,Rails 5.0 to 5.1: Change all *_filter methods to *_action,"Rails 5.1 removes support for *_filter usage, use *_action instead",27
+Rails 5.0 to 5.1,Stop using raise_in_transactional_callbacks,Rails 5.0 to 5.1: Stop using raise_in_transactional_callbacks,Remove option from ./config/application.rb,28
+Rails 5.0 to 5.1,"Stop using `uniq`, start using `distinct`","Rails 5.0 to 5.1: Stop using `uniq`, start using `distinct`","# Current
+
+Stop using `uniq` as it is deprecated
+
+# Expected
+
+Start using `distinct` instead
+
+## Details
+
+```
+$ grep ""DEPRECATION WARNING: uniq is deprecated"" *.log
+1test.log:[2017-08-03 00:00:00 +0000] [47082440674580] DEPRECATION WARNING: uniq is deprecated and will be removed from Rails 5.1 (use distinct instead) (called from opted_in_clients at /home/circleci/project/app/models/smart_folder.rb:511)
+1test.log:[2017-08-03 00:00:00 +0000] [47082440674580] DEPRECATION WARNING: uniq is deprecated and will be removed from Rails 5.1 (use distinct instead) (called from opted_in_clients at /home/circleci/project/app/models/smart_folder.rb:511)
+```",29
+Rails 5.0 to 5.1,Method symbolize_keys is deprecated and will be removed in Rails 5.1,Rails 5.0 to 5.1: Method symbolize_keys is deprecated and will be removed in Rails 5.1,"# Current
+
+DEPRECATION WARNING: Method symbolize_keys is deprecated and will be removed in Rails 5.1, as `ActionController::Parameters` no longer inherits from hash. Using this deprecated behavior exposes potential security problems. If you continue to use this method you may be creating a security vulnerability in your app that can be exploited. Instead, consider using one of these documented methods which are not deprecated: http://api.rubyonrails.org/v5.0.7.2/classes/ActionController/Parameters.html (called from create_envelope at /home/circleci/project/app/controllers/folio/docusign_controller.rb:10)
+
+# Expected
+
+Stop using `symbolize_keys`
+
+## WARNING: There are A LOT of references to this method in the project.",30
+Rails 5.0 to 5.1,Stop comparing equality between `ActionController::Parameters` and a `Hash`,Rails 5.0 to 5.1: Stop comparing equality between `ActionController::Parameters` and a `Hash`,"# Current
+
+There are many places where we compare equality between `ActionController::Parameters` and a `Hash`
+
+# Expected
+
+We should stop doing that as Parameters no longer are an instance of Hash
+",31
+Rails 5.0 to 5.1,use_transactional_fixtures was replaced by use_transactional_tests,Rails 5.0 to 5.1: use_transactional_fixtures was replaced by use_transactional_tests,More here: https://www.ombulabs.com/blog/rails/upgrades/upgrade-rails-from-5-0-to-5-1.html,32
+Rails 5.0 to 5.1,Fix issues with ActiveModel::Dirty API changes,Rails 5.0 to 5.1: Fix issues with ActiveModel::Dirty API changes,"# Current
+
+Failures related to API change: https://gist.github.com/etagwerker/d17d343d1a6d7a65c423b4b1034ac607
+
+# Expected
+
+Start using new API",33
+Rails 5.0 to 5.1,Method with_indifferent_access is deprecated and will be removed in Rails 5.1,Rails 5.0 to 5.1: Method with_indifferent_access is deprecated and will be removed in Rails 5.1,"# Current
+
+We are using `with_indifferent_access`
+
+# Expected
+
+We should stop using `with_indifferent_access`
+
+## Details
+
+```
+1test.log:DEPRECATION WARNING: Method with_indifferent_access is deprecated and will be removed in Rails 5.1, as `ActionController::Parameters` no longer inherits from hash. Using this deprecated behavior exposes potential security problems. If you continue to use this method you may be creating a security vulnerability in your app that can be exploited. Instead, consider using one of these documented methods which are not deprecated: http://api.rubyonrails.org/v5.0.7.2/classes/ActionController/Parameters.html (called from from_cloudmailin at /home/circleci/project/lib/core_extensions.rb:385)
+```",34
+Rails 5.0 to 5.1,implement encrypted secrets,Rails 5.0 to 5.1: implement encrypted secrets,,35
+Rails 5.0 to 5.1,unify form_for and form_tag into form_with,Rails 5.0 to 5.1: unify form_for and form_tag into form_with,,36
+Rails 5.0 to 5.1,dotenv-rails 2.1.1 - upgrade to 2.7.5,Rails 5.0 to 5.1: dotenv-rails 2.1.1 - upgrade to 2.7.5,,37
+Rails 5.0 to 5.1,jbuilder 2.6.0 - upgrade to 2.9.1,Rails 5.0 to 5.1: jbuilder 2.6.0 - upgrade to 2.9.1,,38
+Rails 5.0 to 5.1,lograge 0.4.1 - upgrade to 0.11.2,Rails 5.0 to 5.1: lograge 0.4.1 - upgrade to 0.11.2,,39
+Rails 5.0 to 5.1,meta_request 0.4.0 - upgrade to 0.7.2,Rails 5.0 to 5.1: meta_request 0.4.0 - upgrade to 0.7.2,,40
+Rails 5.0 to 5.1,paranoia 2.2.0 - upgrade to 2.4.2,Rails 5.0 to 5.1: paranoia 2.2.0 - upgrade to 2.4.2,,41
+Rails 5.0 to 5.1,rails-dom-testing 1.0.9 - upgrade to 2.0.3,Rails 5.0 to 5.1: rails-dom-testing 1.0.9 - upgrade to 2.0.3,,42
+Rails 5.0 to 5.1,Stop passing `ActiveRecord::Base` objects to `sanitize_sql_hash_for_assignment`,Rails 5.0 to 5.1: Stop passing `ActiveRecord::Base` objects to `sanitize_sql_hash_for_assignment`,"# Current
+
+Passing `ActiveRecord::Base` objects to `sanitize_sql_hash_for_assignment` (or methods which call it, such as `update_all`) is deprecated.
+
+# Expected
+
+Please pass the id directly, instead
+
+## Details
+
+```
+$ grep ""methods which call it"" *.log
+5test.log:DEPRECATION WARNING: Passing `ActiveRecord::Base` objects to `sanitize_sql_hash_for_assignment` (or methods which call it, such as `update_all`) is deprecated. Please pass the id directly, instead. (called from block in create_atomic_delayed_job at /home/circleci/project/lib/model_extensions.rb:68)
+```",43
+Rails 5.0 to 5.1,Stop using `render :text`,Rails 5.0 to 5.1: Stop using `render :text`,"# Current
+
+There are some references to `render :text`
+
+# Expected
+
+We should stop using that API.
+
+## Details
+
+```
+$ grep ""DEPRECATION WARNING: \`render :text"" *.log
+1test.log:DEPRECATION WARNING: `render :text` is deprecated because it does not actually render a `text/plain` response. Switch to `render plain: 'plain text'` to render as `text/plain`, `render html: '<strong>HTML</strong>'` to render as `text/html`, or `render body: 'raw'` to match the deprecated behavior and render with the default Content-Type, which is `text/html`. (called from rescue in process_email at /home/circleci/project/app/controllers/email/cloud_mail_in_controller.rb:25)
+1test.log:DEPRECATION WARNING: `render :text` is deprecated because it does not actually render a `text/plain` response. Switch to `render plain: 'plain text'` to render as `text/plain`, `render html: '<strong>HTML</strong>'` to render as `text/html`, or `render body: 'raw'` to match the deprecated behavior and render with the default Content-Type, which is `text/html`. (called from rescue in process_email at /home/circleci/project/app/controllers/email/cloud_mail_in_controller.rb:25)
+1test.log:DEPRECATION WARNING: `render :text` is deprecated because it does not actually render a `text/plain` response. Switch to `render plain: 'plain text'` to render as `text/plain`, `render html: '<strong>HTML</strong>'` to render as `text/html`, or `render body: 'raw'` to match the deprecated behavior and render with the default Content-Type, which is `text/html`. (called from process_email at /home/circleci/project/app/controllers/email/cloud_mail_in_controller.rb:11)
+1test.log:DEPRECATION WARNING: `render :text` is deprecated because it does not actually render a `text/plain` response. Switch to `render plain: 'plain text'` to render as `text/plain`, `render html: '<strong>HTML</strong>'` to render as `text/html`, or `render body: 'raw'` to match the deprecated behavior and render with the default Content-Type, which is `text/html`. (called from process_email at /home/circleci/project/app/controllers/email/cloud_mail_in_controller.rb:11)
+1test.log:DEPRECATION WARNING: `render :text` is deprecated because it does not actually render a `text/plain` response. Switch to `render plain: 'plain text'` to render as `text/plain`, `render html: '<strong>HTML</strong>'` to render as `text/html`, or `render body: 'raw'` to match the deprecated behavior and render with the default Content-Type, which is `text/html`. (called from process_email at /home/circleci/project/app/controllers/email/cloud_mail_in_controller.rb:13)
+1test.log:DEPRECATION WARNING: `render :text` is deprecated because it does not actually render a `text/plain` response. Switch to `render plain: 'plain text'` to render as `text/plain`, `render html: '<strong>HTML</strong>'` to render as `text/html`, or `render body: 'raw'` to match the deprecated behavior and render with the default Content-Type, which is `text/html`. (called from rescue in process_email at /home/circleci/project/app/controllers/email/cloud_mail_in_controller.rb:22)
+```",44
+Rails 5.0 to 5.1,Fix conflicts with rebases,Rails 5.0 to 5.1: Fix conflicts with rebases,,45
+Rails 5.0 to 5.1,Deploy to staging and QA,Rails 5.0 to 5.1: Deploy to staging and QA,,46
+Rails 5.0 to 5.1,Fix broken build with Rails 5.1,Rails 5.0 to 5.1: Fix broken build with Rails 5.1,There will be many failures. Fix them all.,47
+Rails 5.0 to 5.1,Address all deprecation warnings listed in the Rails 5.0 test.log,Rails 5.0 to 5.1: Address all deprecation warnings listed in the Rails 5.0 test.log,"Introduce as many backwards compatible changes as possible.
+
+",48
+Rails 5.0 to 5.1,Deploy to production and QA,Rails 5.0 to 5.1: Deploy to production and QA,,49
+Rails 5.1 to 5.2,`bundle install` using Rails 5.2,Rails 5.1 to 5.2: `bundle install` using Rails 5.2,"# Current
+
+Bumping the version to rails 5.2 will probably fail with the current set of dependencies.
+
+# Expected
+
+Add conditionals to `Gemfile` so that we can start bundling with the next version of Rails.
+
+## Exit criteria
+
+`bundle install` should work with rails version 5.2",50
+Rails 5.1 to 5.2,Setup dual boot in Circle CI,Rails 5.1 to 5.2: Setup dual boot in Circle CI,"# Current
+
+We are running the build using Rails 5.2
+
+# Expected
+
+We should be running the building using Rails 5.1 and Rails 5.2",51
+Rails 5.1 to 5.2,default_value_for -> upgrade to 3.3.0,Rails 5.1 to 5.2: default_value_for -> upgrade to 3.3.0,"More details:
+
+```
+$ bundle exec bundle_report compatibility --rails-version=5.2.3
+                => Incompatible with Rails 5.2.3 (with new versions that are compatible):
+        These gems will need to be upgraded before upgrading to Rails 5.2.3.
+
+                acts_as_paranoid 0.5.0 - upgrade to 0.6.0
+                default_value_for 3.0.5 - upgrade to 3.3.0
+                devise 3.4.1 - upgrade to 4.7.0
+                flavors 0.6.0 - upgrade to 1.0.0
+                interactor-rails 2.0.2 - upgrade to 2.2.1
+                jquery-rails 2.1.4 - upgrade to 4.3.5
+                premailer-rails 1.8.2 - upgrade to 1.10.3
+                rails-dom-testing 1.0.9 - upgrade to 2.0.3
+                rails-observers 0.1.2 - upgrade to 0.1.5
+
+                        => Incompatible with Rails 5.2.3 (with no new compatible versions):
+        These gems will need to be removed or replaced before upgrading to Rails 5.2.3.
+
+                db-charmer 2.0.0.rn.dev2 (loaded from git) - new version, 1.9.1, is not compatible with Rails 5.2.3
+                prototype-rails 4.0.0 (loaded from git) - new version, 4.0.1, is not compatible with Rails 5.2.3
+                quiet_assets 1.1.0 - new version, 1.1.0, is not compatible with Rails 5.2.3
+
+                        => Incompatible with Rails 5.2.3 (with no new versions):
+        These gems will need to be upgraded by us or removed before upgrading to Rails 5.2.3.
+        This list is likely to contain internal gems, like Cuddlefish.
+
+                rin-tin-tin 0.0.1 (loaded from git) - new version not found
+
+                13 gems incompatible with Rails 5.2.3
+```",52
+Rails 5.1 to 5.2,The behavior of `attribute_changed?` ,Rails 5.1 to 5.2: The behavior of `attribute_changed?` ,"# DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails. -  app/models
+
+Use the correct names for rails 5.2 `ActiveRecord::Dirty` methods.
+
+See: https://www.ombulabs.com/blog/rails/upgrades/active-record-5-1-api-changes.html",53
+Rails 5.1 to 5.2,Add `bootsnap` configuration,Rails 5.1 to 5.2: Add `bootsnap` configuration,This should improve performance when loading the application. Make sure everything works as expected after setting  this up. ,54
+Rails 5.1 to 5.2,Added config/credentials.yml.enc file to store production app secrets.,Rails 5.1 to 5.2: Added config/credentials.yml.enc file to store production app secrets.,,55
+Rails 5.1 to 5.2,audited 4.5.0 - upgrade to 4.9.0,Rails 5.1 to 5.2: audited 4.5.0 - upgrade to 4.9.0,,56
+Rails 5.1 to 5.2,coffee-rails 4.2.1 - upgrade to 5.0.0,Rails 5.1 to 5.2: coffee-rails 4.2.1 - upgrade to 5.0.0,,57
+Rails 5.1 to 5.2,dotenv-rails 2.1.1 - upgrade to 2.7.5,Rails 5.1 to 5.2: dotenv-rails 2.1.1 - upgrade to 2.7.5,,58
+Rails 5.1 to 5.2,jbuilder 2.6.0 - upgrade to 2.9.1,Rails 5.1 to 5.2: jbuilder 2.6.0 - upgrade to 2.9.1,,59
+Rails 5.1 to 5.2,lograge 0.4.1 - upgrade to 0.11.2,Rails 5.1 to 5.2: lograge 0.4.1 - upgrade to 0.11.2,,60
+Rails 5.1 to 5.2,meta_request 0.4.0 - upgrade to 0.7.2,Rails 5.1 to 5.2: meta_request 0.4.0 - upgrade to 0.7.2,,61
+Rails 5.1 to 5.2,paranoia 2.2.0 - upgrade to 2.4.2,Rails 5.1 to 5.2: paranoia 2.2.0 - upgrade to 2.4.2,,62
+Rails 5.1 to 5.2,rails-dom-testing 1.0.9 - upgrade to 2.0.3,Rails 5.1 to 5.2: rails-dom-testing 1.0.9 - upgrade to 2.0.3,,63
+Rails 5.1 to 5.2,Expire cookies after deployment,Rails 5.1 to 5.2: Expire cookies after deployment,"Cookies generated with Rails 5.1 won't be compatible with Rails 5.2. Expire sessions.
+
+https://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#expiry-in-signed-or-encrypted-cookie-is-now-embedded-in-the-cookies-values",64
+Rails 5.1 to 5.2,Address all deprecation warnings listed in the Rails 5.1 test.log,Rails 5.1 to 5.2: Address all deprecation warnings listed in the Rails 5.1 test.log,"Introduce as many backwards compatible changes as possible.
+",65
+Rails 5.1 to 5.2,Fix broken build with Rails 5.2,Rails 5.1 to 5.2: Fix broken build with Rails 5.2,There will be many failures. Fix them all.,66
+Rails 5.1 to 5.2,Fix conflicts with rebases,Rails 5.1 to 5.2: Fix conflicts with rebases,,67
+Rails 5.1 to 5.2,Deploy to staging and QA,Rails 5.1 to 5.2: Deploy to staging and QA,,68
+Rails 5.1 to 5.2,Deploy to production and QA,Rails 5.1 to 5.2: Deploy to production and QA,,69
+Rails 5.2 to 6.0,`bundle install` using Rails 6.0,Rails 5.2 to 6.0: `bundle install` using Rails 6.0,"# Current
+
+Bumping the version to rails 6.0 will probably fail with the current set of dependencies.
+
+# Expected
+
+Add conditionals to `Gemfile` so that we can start bundling with the next version of Rails.
+
+## Exit criteria
+
+`bundle install` should work with rails version 6.0",70
+Rails 5.2 to 6.0,Setup dual boot in Circle CI,Rails 5.2 to 6.0: Setup dual boot in Circle CI,"# Current
+
+We are running the build using Rails 5.2
+
+# Expected
+
+We should be running the building using Rails 5.2 and Rails 6.0",71
+Rails 5.2 to 6.0,Address all deprecation warnings listed in the Rails 5.2 test.log,Rails 5.2 to 6.0: Address all deprecation warnings listed in the Rails 5.2 test.log,"Introduce as many backwards compatible changes as possible.
+",72
+Rails 5.2 to 6.0,Migrate to webpack (optional),Rails 5.2 to 6.0: Migrate to webpack (optional),,73
+Rails 5.2 to 6.0,audited 4.5.0 - upgrade to 4.9.0,Rails 5.2 to 6.0: audited 4.5.0 - upgrade to 4.9.0,,74
+Rails 5.2 to 6.0,coffee-rails 4.2.1 - upgrade to 5.0.0,Rails 5.2 to 6.0: coffee-rails 4.2.1 - upgrade to 5.0.0,,75
+Rails 5.2 to 6.0,devise 4.6.1 - upgrade to 4.7.1,Rails 5.2 to 6.0: devise 4.6.1 - upgrade to 4.7.1,,76
+Rails 5.2 to 6.0,dotenv-rails 2.1.1 - upgrade to 2.7.5,Rails 5.2 to 6.0: dotenv-rails 2.1.1 - upgrade to 2.7.5,,77
+Rails 5.2 to 6.0,jbuilder 2.6.0 - upgrade to 2.9.1,Rails 5.2 to 6.0: jbuilder 2.6.0 - upgrade to 2.9.1,,78
+Rails 5.2 to 6.0,lograge 0.4.1 - upgrade to 0.11.2,Rails 5.2 to 6.0: lograge 0.4.1 - upgrade to 0.11.2,,79
+Rails 5.2 to 6.0,meta_request 0.4.0 - upgrade to 0.7.2,Rails 5.2 to 6.0: meta_request 0.4.0 - upgrade to 0.7.2,,80
+Rails 5.2 to 6.0,paranoia 2.2.0 - upgrade to 2.4.2,Rails 5.2 to 6.0: paranoia 2.2.0 - upgrade to 2.4.2,,81
+Rails 5.2 to 6.0,rails-dom-testing 1.0.9 - upgrade to 2.0.3,Rails 5.2 to 6.0: rails-dom-testing 1.0.9 - upgrade to 2.0.3,,82
+Rails 5.2 to 6.0,redis-actionpack 5.0.0 - upgrade to 5.1.0,Rails 5.2 to 6.0: redis-actionpack 5.0.0 - upgrade to 5.1.0,,83
+Rails 5.2 to 6.0,redis-activesupport 5.0.1 - upgrade to 5.2.0,Rails 5.2 to 6.0: redis-activesupport 5.0.1 - upgrade to 5.2.0,,84
+Rails 5.2 to 6.0,responders 2.4.1 - upgrade to 3.0.0,Rails 5.2 to 6.0: responders 2.4.1 - upgrade to 3.0.0,,85
+Rails 5.2 to 6.0,sass-rails 5.0.6 - upgrade to 6.0.0,Rails 5.2 to 6.0: sass-rails 5.0.6 - upgrade to 6.0.0,,86
+Rails 5.2 to 6.0,sass-rails 5.0.7 - upgrade to 6.0.0,Rails 5.2 to 6.0: sass-rails 5.0.7 - upgrade to 6.0.0,"More details:
+
+```
+$ bundle exec bundle_report compatibility --rails-version=6.0.0
+                => Incompatible with Rails 6.0.0 (with new versions that are compatible):
+        These gems will need to be upgraded before upgrading to Rails 6.0.0.
+
+                awesome_nested_set 3.1.4 - upgrade to 3.2.0
+                default_value_for 3.0.5 - upgrade to 3.3.0
+                devise 3.4.1 - upgrade to 4.7.0
+                flavors 0.6.0 - upgrade to 1.0.0
+                interactor-rails 2.0.2 - upgrade to 2.2.1
+                jquery-rails 2.1.4 - upgrade to 4.3.5
+                premailer-rails 1.8.2 - upgrade to 1.10.3
+                rails-dom-testing 1.0.9 - upgrade to 2.0.3
+                rails-observers 0.1.2 - upgrade to 0.1.5
+                responders 2.4.0 - upgrade to 3.0.0
+                sass-rails 5.0.7 - upgrade to 6.0.0
+
+                        => Incompatible with Rails 6.0.0 (with no new compatible versions):
+        These gems will need to be removed or replaced before upgrading to Rails 6.0.0.
+
+                actionpack-action_caching 1.2.0 - new version, 1.2.0, is not compatible with Rails 6.0.0
+                actionpack-page_caching 1.1.0 - new version, 1.1.1, is not compatible with Rails 6.0.0
+                acts_as_paranoid 0.5.0 - new version, 0.6.0, is not compatible with Rails 6.0.0
+                db-charmer 2.0.0.rn.dev2 (loaded from git) - new version, 1.9.1, is not compatible with Rails 6.0.0
+                prototype-rails 4.0.0 (loaded from git) - new version, 4.0.1, is not compatible with Rails 6.0.0
+                quiet_assets 1.1.0 - new version, 1.1.0, is not compatible with Rails 6.0.0
+                remockable 0.3.6 - new version, 0.3.6, is not compatible with Rails 6.0.0
+
+                        => Incompatible with Rails 6.0.0 (with no new versions):
+        These gems will need to be upgraded by us or removed before upgrading to Rails 6.0.0.
+        This list is likely to contain internal gems, like Cuddlefish.
+
+                rin-tin-tin 0.0.1 (loaded from git) - new version not found
+
+                19 gems incompatible with Rails 6.0.0
+```",87
+Rails 5.2 to 6.0,responders 2.4.0 - upgrade to 3.0.0,Rails 5.2 to 6.0: responders 2.4.0 - upgrade to 3.0.0,"More details:
+
+```
+$ bundle exec bundle_report compatibility --rails-version=6.0.0
+                => Incompatible with Rails 6.0.0 (with new versions that are compatible):
+        These gems will need to be upgraded before upgrading to Rails 6.0.0.
+
+                awesome_nested_set 3.1.4 - upgrade to 3.2.0
+                default_value_for 3.0.5 - upgrade to 3.3.0
+                devise 3.4.1 - upgrade to 4.7.0
+                flavors 0.6.0 - upgrade to 1.0.0
+                interactor-rails 2.0.2 - upgrade to 2.2.1
+                jquery-rails 2.1.4 - upgrade to 4.3.5
+                premailer-rails 1.8.2 - upgrade to 1.10.3
+                rails-dom-testing 1.0.9 - upgrade to 2.0.3
+                rails-observers 0.1.2 - upgrade to 0.1.5
+                responders 2.4.0 - upgrade to 3.0.0
+                sass-rails 5.0.7 - upgrade to 6.0.0
+
+                        => Incompatible with Rails 6.0.0 (with no new compatible versions):
+        These gems will need to be removed or replaced before upgrading to Rails 6.0.0.
+
+                actionpack-action_caching 1.2.0 - new version, 1.2.0, is not compatible with Rails 6.0.0
+                actionpack-page_caching 1.1.0 - new version, 1.1.1, is not compatible with Rails 6.0.0
+                acts_as_paranoid 0.5.0 - new version, 0.6.0, is not compatible with Rails 6.0.0
+                db-charmer 2.0.0.rn.dev2 (loaded from git) - new version, 1.9.1, is not compatible with Rails 6.0.0
+                prototype-rails 4.0.0 (loaded from git) - new version, 4.0.1, is not compatible with Rails 6.0.0
+                quiet_assets 1.1.0 - new version, 1.1.0, is not compatible with Rails 6.0.0
+                remockable 0.3.6 - new version, 0.3.6, is not compatible with Rails 6.0.0
+
+                        => Incompatible with Rails 6.0.0 (with no new versions):
+        These gems will need to be upgraded by us or removed before upgrading to Rails 6.0.0.
+        This list is likely to contain internal gems, like Cuddlefish.
+
+                rin-tin-tin 0.0.1 (loaded from git) - new version not found
+
+                19 gems incompatible with Rails 6.0.0
+```",88
+Rails 5.2 to 6.0,Rename `be_success` to `be_successful`,Rails 5.2 to 6.0: Rename `be_success` to `be_successful`,"Remove deprecated methods in ActionDispatch::TestResponse: #success? in favor of #successful?, #missing? in favor of #not_found?, #error? in favor of #server_error?",89
+Rails 5.2 to 6.0,Remove calls to deprecated `config.secret_token`,Rails 5.2 to 6.0: Remove calls to deprecated `config.secret_token`,More here: https://github.com/rails/rails/commit/46ac5fe69a20d4539a15929fe48293e1809a26b0,90
+Rails 5.2 to 6.0,Solve issues with new autoloading mechanism (zeitwerk),Rails 5.2 to 6.0: Solve issues with new autoloading mechanism (zeitwerk),"The default configuration for Rails 6
+
+# config/application.rb
+
+config.load_defaults ""6.0""
+enables zeitwerk autoloading mode on CRuby. In that mode, autoloading, reloading, and eager loading are managed by Zeitwerk.",91
+Rails 5.2 to 6.0,"Verify one file, one constant (autoload)","Rails 5.2 to 6.0: Verify one file, one constant (autoload)","2.6.8 One file, one constant (at the same top-level)
+
+In classic mode you could technically define several constants at the same top-level and have them all reloaded. For example, given
+
+```
+# app/models/foo.rb
+
+class Foo
+end
+
+class Bar
+end
+while Bar could not be autoloaded, autoloading Foo would mark Bar as autoloaded too. This is not the case in zeitwerk mode, you need to move Bar to its own file bar.rb. One file, one constant.
+```",92
+Rails 5.2 to 6.0,Fix broken build with Rails 6.0,Rails 5.2 to 6.0: Fix broken build with Rails 6.0,There will be many failures. Fix them all.,93
+Rails 5.2 to 6.0,Fix conflicts with rebases,Rails 5.2 to 6.0: Fix conflicts with rebases,,94
+Rails 5.2 to 6.0,Deploy to staging and QA,Rails 5.2 to 6.0: Deploy to staging and QA,,95
+Rails 5.2 to 6.0,Deploy to production and QA,Rails 5.2 to 6.0: Deploy to production and QA,,96
+Rails 5.2 to 6.0,Expire cookies after deployment,Rails 5.2 to 6.0: Expire cookies after deployment,"Cookies generated with Rails 5.2 won't be compatible with Rails 6.0. Expire sessions.
+
+https://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#expiry-in-signed-or-encrypted-cookie-is-now-embedded-in-the-cookies-values",97
\ No newline at end of file
diff --git a/pull_request_template.md b/pull_request_template.md
deleted file mode 100644
index c09598f5..00000000
--- a/pull_request_template.md
+++ /dev/null
@@ -1,16 +0,0 @@
-### Jira Ticket 
-<!--- Add a link to the Jira ticket associated with this PR -->
-
-### Motivation / Context
-<!--- Why is this change required? Summarize the changes you made.  -->
-<!--- Describe the approach to solve the problem or complete the task -->
-    
-### QA / Testing Instructions
-<!--- List the steps required to review the changes locally or in staging -->
-
-### Screenshots:
-<!-- Add screenshots (applicable to any UI changes) -->
-
-___
-
-I will abide by the [code of conduct](https://github.com/fastruby/points/blob/main/CODE_OF_CONDUCT.md).
diff --git a/spec/apparition_helper.rb b/spec/apparition_helper.rb
new file mode 100644
index 00000000..aa239f6f
--- /dev/null
+++ b/spec/apparition_helper.rb
@@ -0,0 +1,15 @@
+unless ENV['CI']
+  require 'capybara/apparition'
+
+  Capybara.register_driver :apparition do |app|
+    Capybara::Apparition::Driver.new(
+      app,
+      browser_options: {
+        'no-sandbox' => nil,
+        'disable-features' => 'VizDisplayCompositor'
+      }
+    )
+  end
+
+  Capybara.javascript_driver = :apparition
+end
diff --git a/spec/controllers/action_plans_controller.rb b/spec/controllers/action_plans_controller.rb
deleted file mode 100644
index 81177d75..00000000
--- a/spec/controllers/action_plans_controller.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require "rails_helper"
-
-RSpec.describe ActionPlansController, type: :controller do
-  let(:project) { FactoryBot.create(:project) }
-
-  describe "#show" do
-    it "redirects to sign_in route if not authenticated" do
-      get :show, params: {project_id: project.id}
-      expect(response).to redirect_to(ombu_labs_auth.new_user_session_path)
-    end
-
-    it "returns view when user is signed in" do
-      @request.env["devise.mapping"] = Devise.mappings[:user]
-      user = FactoryBot.create(:user)
-      sign_in user
-
-      get :show, params: {project_id: project.id}
-
-      expect(response).to be_success
-      expect(response).to render_template(:show)
-    end
-  end
-end
diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
deleted file mode 100644
index 30fe4c2a..00000000
--- a/spec/controllers/comments_controller_spec.rb
+++ /dev/null
@@ -1,113 +0,0 @@
-require "rails_helper"
-
-RSpec.describe CommentsController, type: :controller do
-  render_views
-
-  let!(:user) { FactoryBot.create(:user) }
-  let!(:project) { FactoryBot.create(:project) }
-  let!(:story) { FactoryBot.create(:story, project: project) }
-  let!(:comment) { FactoryBot.create(:comment, story: story, user: user) }
-
-  before do
-    @request.env["devise.mapping"] = Devise.mappings[:user]
-    sign_in user
-  end
-
-  describe "#create" do
-    context "with valid attributes" do
-      let(:valid_params) { FactoryBot.attributes_for(:comment) }
-
-      it "creates a new comment" do
-        expect {
-          post :create, params: {project_id: project.id, story_id: story.id, comment: valid_params}
-        }.to change(Comment, :count).by(1)
-      end
-
-      it "redirects to the story path" do
-        post :create, params: {project_id: project.id, story_id: story.id, comment: valid_params}
-
-        expect(response).to redirect_to project_story_path(project.id, story.id)
-      end
-    end
-
-    context "with invalid attributes" do
-      let(:invalid_params) { {body: ""} }
-
-      it "redirects back to the story page" do
-        post :create, params: {project_id: project.id, story_id: story.id, comment: invalid_params}
-        expect(response).to redirect_to project_story_path(project.id, story.id)
-      end
-    end
-  end
-
-  describe "#destroy" do
-    it "deletes the comment" do
-      delete :destroy, params: {project_id: project.id, story_id: story.id, id: comment.id}
-      expect(Comment.exists?(comment.id)).to be_falsey
-      expect(response).to redirect_to project_story_path(project.id, story.id)
-    end
-
-    it "disallows destroying another users' comment" do
-      user2 = FactoryBot.create(:user)
-      comment2 = FactoryBot.create(:comment, story: story, user: user2)
-
-      delete :destroy, params: {id: comment2.id, story_id: story.id, project_id: project.id}
-
-      expect(response).to redirect_to project_story_path(project.id, story.id)
-      expect(flash[:error]).to eq "Comment not found"
-    end
-  end
-
-  describe "#edit" do
-    before do
-      get :edit, params: {id: comment.id, story_id: story.id, project_id: project.id}
-    end
-
-    it "redirects to the edit page" do
-      expect(response).to render_template :edit
-    end
-
-    it "shows the fields for the comment" do
-      expect(assigns(:comment)).to eq comment
-    end
-  end
-
-  describe "#edit as other user" do
-    it "disallows editing another users' comment" do
-      user2 = FactoryBot.create(:user)
-      comment2 = FactoryBot.create(:comment, story: story, user: user2)
-
-      get :edit, params: {id: comment2.id, story_id: story.id, project_id: project.id}
-
-      expect(response).to redirect_to project_story_path(project.id, story.id)
-      expect(flash[:error]).to eq "Comment not found"
-    end
-  end
-
-  describe "#update" do
-    it "updates the body for the comment" do
-      put :update, params: {
-        id: comment.id,
-        story_id: story.id,
-        project_id: project.id,
-        comment: {
-          body: "test123"
-        }
-      }
-      expect(comment.reload.body).to eq "test123"
-    end
-
-    it "disallows updating another users' comment" do
-      user2 = FactoryBot.create(:user)
-      comment2 = FactoryBot.create(:comment, story: story, user: user2)
-
-      put :update, params: {id: comment2.id,
-                            story_id: story.id,
-                            project_id: project.id,
-                            comment: {body: "test123"}}
-
-      expect(response).to redirect_to project_story_path(project.id, story.id)
-      expect(flash[:error]).to eq "Comment not found"
-    end
-  end
-end
diff --git a/spec/controllers/estimates_controller_spec.rb b/spec/controllers/estimates_controller_spec.rb
index a9fe42fa..9ddd5d02 100644
--- a/spec/controllers/estimates_controller_spec.rb
+++ b/spec/controllers/estimates_controller_spec.rb
@@ -1,28 +1,29 @@
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe EstimatesController, type: :controller do
   render_views
 
-  let(:user) { FactoryBot.create(:user) }
-  let(:project) { FactoryBot.create(:project) }
-  let(:story) { FactoryBot.create(:story, project: project) }
-  let(:estimate) { FactoryBot.create(:estimate, story: story, user: user) }
+  let!(:user) { FactoryBot.create(:user) }
+  let!(:project) { FactoryBot.create(:project) }
+  let!(:story) { FactoryBot.create(:story, project: project) }
+  let!(:estimate) { FactoryBot.create(:estimate, story: story, user: user) }
 
   before do
     @request.env["devise.mapping"] = Devise.mappings[:user]
+    user = FactoryBot.create(:user)
     sign_in user
   end
 
   describe "#new" do
     it "redirects to the new page" do
-      get :new, params: {id: estimate.id, story_id: story.id, project_id: project.id}
+      get :new, params: { id: estimate.id, story_id: story.id, project_id: project.id, user_id: user.id }
       expect(response).to render_template :new
     end
   end
 
   describe "#edit" do
     before do
-      get :edit, params: {id: estimate.id, story_id: story.id, project_id: project.id}
+      get :edit, params: { id: estimate.id, story_id: story.id, project_id: project.id, user_id: user.id }
     end
 
     it "redirects to the edit page" do
@@ -34,48 +35,36 @@
     end
   end
 
-  describe "#edit as other user" do
-    it "disallows editing another users' estimate" do
-      user2 = FactoryBot.create(:user)
-      estimate2 = FactoryBot.create(:estimate, story: story, user: user2)
-
-      get :edit, params: {id: estimate2.id, story_id: story.id, project_id: project.id}
-
-      expect(response).to redirect_to project_path(story.project)
-      expect(flash[:error]).to eq "Estimate not found"
-    end
-  end
-
   describe "#create" do
     context "with valid attributes" do
-      let(:estimate_params) {
-        {best_case_points: 1, worst_case_points: 3}
+      let(:valid_params) {
+        { best_case_points: 1, worst_case_points: 3, story_id: story.id }
       }
 
       it "creates a new estimate" do
-        expect {
-          post :create, params: {project_id: project.id,
-                                 story_id: story.id,
-                                 estimate: estimate_params}
-        }.to change(Estimate, :count).by(1)
+        expect do
+          post :create, params: { project_id: project.id,
+                                  story_id: story.id,
+                                  estimate: valid_params }
+        end.to change(Estimate, :count).by(1)
       end
 
       it "redirects to the new estimate" do
-        post :create, params: {story_id: story.id,
-                               project_id: project.id,
-                               estimate: estimate_params}
+        post :create, params: { story_id: story.id,
+                                project_id: project.id,
+                                estimate: valid_params }
 
         expect(response).to redirect_to project_path(project.id)
       end
     end
 
     context "with invalid attributes" do
-      let(:invalid_attributes) { {best_case_points: ""} }
+      let(:invalid_attributes) { {:best_case_points=>""} }
 
       before do
-        post :create, params: {story_id: story.id,
-                               project_id: project.id,
-                               estimate: invalid_attributes}
+        post :create, params: { story_id: story.id,
+                                project_id: project.id,
+                                estimate: invalid_attributes }
       end
 
       it "stays on the new template page" do
@@ -86,81 +75,25 @@
         expect(flash[:error]).to be_present
       end
     end
-
-    context "if there is already an estimate" do
-      let(:params) do
-        {
-          story_id: story.id,
-          project_id: project.id,
-          estimate: {
-            best_case_points: 1,
-            worst_case_points: 3
-          }
-        }
-      end
-
-      let!(:estimate) { FactoryBot.create(:estimate, story: story, user: user, best_case_points: 2, worst_case_points: 5) }
-
-      it "does not create a new estimate" do
-        expect {
-          post :create, params: params
-        }.to change(Estimate, :count).by(0)
-      end
-
-      it "updates the current estimate" do
-        expect(estimate.best_case_points).to be 2
-        expect(estimate.worst_case_points).to be 5
-
-        post :create, params: params
-
-        estimate.reload
-        expect(estimate.best_case_points).to be 1
-        expect(estimate.worst_case_points).to be 3
-      end
-    end
   end
 
   describe "#destroy" do
     it "deletes the estimate" do
-      estimate # call `estimate` so rspec creates the object
-
-      expect {
-        delete :destroy, params: {id: estimate.id, story_id: story.id, project_id: project.id}
-      }.to change(Estimate, :count).by(-1)
-    end
-
-    it "disallows destroying another users' estimate" do
-      user2 = FactoryBot.create(:user)
-      estimate2 = FactoryBot.create(:estimate, story: story, user: user2)
-
-      delete :destroy, params: {id: estimate2.id, story_id: story.id, project_id: project.id}
-
-      expect(response).to redirect_to project_path(story.project)
-      expect(flash[:error]).to eq "Estimate not found"
+      expect do
+        delete :destroy, params: { id: estimate.id, story_id: story.id, project_id: project.id }
+      end.to change(Estimate, :count).by(-1)
     end
   end
 
   describe "#update" do
     it "updates the estimate" do
-      put :update, params: {id: estimate.id,
-                            story_id: story.id,
-                            project_id: project.id,
-                            estimate: {best_case_points: "7", worst_case_points: "10"}}
+      put :update, params: { id: estimate.id,
+                             story_id: story.id,
+                             project_id: project.id,
+                             estimate: { best_case_points: "7", worst_case_points: "10" }}
 
       expect(estimate.reload.best_case_points).to eq 7
     end
-
-    it "disallows updating another users' estimate" do
-      user2 = FactoryBot.create(:user)
-      estimate2 = FactoryBot.create(:estimate, story: story, user: user2)
-
-      put :update, params: {id: estimate2.id,
-                            story_id: story.id,
-                            project_id: project.id,
-                            estimate: {best_case_points: "7", worst_case_points: "10"}}
-
-      expect(response).to redirect_to project_path(story.project)
-      expect(flash[:error]).to eq "Estimate not found"
-    end
   end
+
 end
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index ca1a0e4e..57e36032 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -1,10 +1,9 @@
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe ProjectsController, type: :controller do
   render_views
 
-  let!(:project) { FactoryBot.create(:project, status: nil) }
-  let!(:archived_project) { FactoryBot.create(:project, status: "archived") }
+  let!(:project) { FactoryBot.create(:project) }
 
   before do
     @request.env["devise.mapping"] = Devise.mappings[:user]
@@ -12,7 +11,7 @@
     sign_in user
   end
 
-  describe "#index without archived params" do
+  describe "#index" do
     before do
       get :index
     end
@@ -22,16 +21,6 @@
     end
   end
 
-  describe "#index with archived params" do
-    before do
-      get :index, params: {archived: true}
-    end
-
-    it "shows me a list of all the archived projects" do
-      expect(assigns(:projects)).to eq [archived_project]
-    end
-  end
-
   describe "#new" do
     it "redirects to the new page" do
       get :new
@@ -39,14 +28,6 @@
     end
   end
 
-  describe "#new_sub_project" do
-    before do
-      get :new_sub_project, params: {project_id: project.id}
-    end
-
-    it { expect(response).to render_template :new_sub_project }
-  end
-
   describe "#edit" do
     before do
       get :edit, params: {id: project.id}
@@ -64,55 +45,29 @@
   describe "#create" do
     context "with valid attributes" do
       let(:valid_params) { FactoryBot.attributes_for(:project) }
-      let(:valid_sub_proj_params) { FactoryBot.attributes_for(:project, parent_id: project.id) }
 
       it "creates a new project" do
-        expect {
-          post :create, params: {project: valid_params}
-        }.to change(Project, :count).by(1)
+        expect do
+          post :create, params: { :project => valid_params }
+        end.to change(Project, :count).by(1)
       end
 
       it "redirects to the new project" do
-        post :create, params: {project: valid_params}
+        post :create, params: { :project => valid_params }
 
-        expect(response).to redirect_to project_path(Project.last)
-      end
-
-      it "redirects to parent of new sub project" do
-        post :create, params: {project: valid_sub_proj_params}
-
-        expect(response).to redirect_to project_path(project)
+        expect(response).to redirect_to '/projects'
       end
     end
 
     context "with invalid attributes" do
-      let(:invalid_attributes) { {title: ""} }
+      let(:invalid_attributes) { {:title=>""} }
 
       before do
-        post :create, params: {project: invalid_attributes}
+        post :create, params: { :project => invalid_attributes }
       end
 
       it "stays on the new template page" do
-        expect(response).to render_template(:new)
-      end
-
-      it "shows a flash message" do
-        expect(flash[:error]).to be_present
-      end
-    end
-
-    context "with parent id and no title" do
-      let(:parent_project) { {title: "parent", id: 1} }
-      let(:child_project) { {title: ""} }
-      let(:back_path) { project_new_sub_project_path(project_id: parent_project[:id]) }
-
-      before do
-        request.env["HTTP_REFERER"] = back_path
-        post :create, params: {project: child_project}
-      end
-
-      it "stays on the new template page" do
-        expect(response).to render_template(:new)
+        expect(response).to render_template :new
       end
 
       it "shows a flash message" do
@@ -123,41 +78,15 @@
 
   describe "#destroy" do
     it "deletes the project" do
-      expect {
-        delete :destroy, params: {id: project.id, project: {title: project.title}}
-      }.to change(Project, :count).by(-1)
-    end
-
-    it "deletes stripped project's title" do
-      project.update(title: " foo bar ")
-      expect {
-        delete :destroy, params: {id: project.id, project: {title: "foo bar"}}
-      }.to change(Project, :count).by(-1)
-    end
-
-    it "deletes stripped project's params" do
-      project.update(title: "foo bar")
-      expect {
-        delete :destroy, params: {id: project.id, project: {title: "foo bar  "}}
-      }.to change(Project, :count).by(-1)
-    end
-
-    it "does not delete the project" do
-      expect {
-        delete :destroy, params: {id: project.id}
-      }.not_to change(Project, :count)
-    end
-
-    it "does not delete the project when the title does not match" do
-      expect {
-        delete :destroy, params: {id: project.id, project: {title: "random title"}}
-      }.not_to change(Project, :count)
+      expect do
+        delete :destroy, params: { id: project.id }
+      end.to change(Project, :count).by(-1)
     end
   end
 
   describe "#show" do
     before do
-      get :show, params: {id: project.id}
+      get :show, params: { id: project.id }
     end
 
     it "redirects to the show page" do
@@ -171,128 +100,10 @@
 
   describe "#update" do
     it "should update the project" do
-      put :update, params: {id: project.id, project: {title: "New Project Title"}}
+      put :update, params: { id: project.id, project: { title: "New Project Title" }}
 
       expect(project.reload.title).to eq "New Project Title"
     end
   end
 
-  describe "#toggle_archive" do
-    context "should set the status of the project to" do
-      it "archived when it is unarchived" do
-        put :toggle_archive, params: {id: project.id}, xhr: true
-        expect(assigns[:project]).to be_archived
-      end
-
-      it "nil when it is archived" do
-        put :toggle_archive, params: {id: archived_project.id}, xhr: true
-        expect(assigns[:project]).not_to be_archived
-      end
-    end
-  end
-
-  describe "#toggle_locked" do
-    context "when locking a project" do
-      it "returns a datetime" do
-        patch :toggle_locked, params: {id: project.id}, xhr: true
-        expect(assigns[:project]).to be_locked_at
-      end
-
-      it "returns a js response" do
-        patch :toggle_locked, params: {id: project.id}, xhr: true
-        expect(request.format.symbol).to eq(:js)
-      end
-    end
-  end
-
-  describe "cloning" do
-    it "redirects to cloned project" do
-      expect {
-        post :clone, params: {id: project.id, project: {title: "New project"}}
-      }.to change(Project.parents, :count).by(1)
-
-      expect(Project.parents.last.title).to eq("New project")
-      expect(response).to redirect_to "/projects/#{Project.last.id}"
-      expect(flash[:success]).to eq "Project cloned!"
-    end
-
-    context "with a sub project" do
-      let!(:sub_project) { FactoryBot.create(:project, parent: project) }
-
-      it "clones the sub projects when cloning a parent" do
-        expect {
-          post :clone, params: {id: project.id, project: {title: "New title"}}
-        }.to change(Project.parents, :count).by(1)
-
-        last_project = Project.parents.last
-        expect(last_project.id).not_to eq(project.id)
-        expect(project.projects.reload.count).to eq(1)
-        expect(last_project.projects.reload.count).to eq project.projects.count
-      end
-
-      it "clones a sub project as a parent project" do
-        expect {
-          post :clone, params: {id: sub_project.id, project: {title: "New title", parent_id: nil}}
-        }.to change(Project, :count).by(1)
-
-        last_project = Project.last
-        expect(last_project.parent).to be_nil
-      end
-
-      it "clones a sub project in another parent" do
-        other_project = FactoryBot.create(:project)
-
-        expect {
-          post :clone, params: {id: sub_project.id, project: {title: "New title", parent_id: other_project.id}}
-        }.to change(other_project.projects.reload, :count).by(1)
-
-        last_project = other_project.projects.reload.last
-        expect(last_project.parent).to eq(other_project)
-      end
-
-      it "ignores sub-projects if not cloned as a parent" do
-        other_project = FactoryBot.create(:project)
-
-        expect {
-          post :clone, params: {id: project.id, project: {title: "New title", parent_id: other_project.id}, sub_project_ids: [sub_project.id]}
-        }.to change(Project, :count).by(1)
-
-        last_project = other_project.projects.reload.last
-        expect(last_project.projects).to be_empty
-      end
-    end
-
-    context "with stories" do
-      it "creates a cloned project with matching stories" do
-        story = project.stories.create({title: "Story 1"})
-
-        post :clone, params: {id: project.id, project: {title: "New title"}}
-
-        expect(Project.last.stories.first.id).not_to eq story.id
-        expect(Project.last.stories.first.title).to eq story.title
-      end
-
-      it "creates stories without estimates" do
-        story = project.stories.create({title: "Story 1"})
-        story.estimates.create({best_case_points: 1, worst_case_points: 3})
-
-        post :clone, params: {id: project.id, project: {title: "New title"}}
-
-        expect(Project.last.stories.first.estimates).to be_empty
-      end
-    end
-  end
-
-  describe "PATCH sort" do
-    let!(:sub_project1) { FactoryBot.create(:project, parent: project, position: 1) }
-    let!(:sub_project2) { FactoryBot.create(:project, parent: project, position: 2) }
-    let!(:sub_project3) { FactoryBot.create(:project, parent: project, position: 3) }
-
-    it "changes the positions of the sub-projects" do
-      patch :sort, params: {id: project.id, project: [sub_project3.id, sub_project1.id, sub_project2.id]}
-      expect(sub_project3.reload.position).to eq 1
-      expect(sub_project1.reload.position).to eq 2
-      expect(sub_project2.reload.position).to eq 3
-    end
-  end
 end
diff --git a/spec/controllers/reports_controller_spec.rb b/spec/controllers/reports_controller_spec.rb
index 348376fa..36b1749f 100644
--- a/spec/controllers/reports_controller_spec.rb
+++ b/spec/controllers/reports_controller_spec.rb
@@ -1,8 +1,8 @@
-require "rails_helper"
-require "csv"
+require 'rails_helper'
 
 RSpec.describe ReportsController, type: :controller do
-  render_views
+
+  let!(:project) { FactoryBot.create(:project) }
 
   before do
     @request.env["devise.mapping"] = Devise.mappings[:user]
@@ -11,8 +11,6 @@
   end
 
   describe "#index" do
-    let!(:project) { FactoryBot.create(:project) }
-
     before do
       get :index
     end
@@ -23,36 +21,18 @@
   end
 
   describe "#show" do
-    context "using HTML response format" do
-      let!(:project) { FactoryBot.create(:project) }
-
-      before do
-        get :show, params: {project_id: project.id}
-      end
-
-      it "redirects to the show page" do
-        expect(response).to render_template :show
-      end
-
-      it "shows the attributes for the right project" do
-        expect(assigns(:project)).to eq project
-      end
+    before do
+      get :show, params: { project_id: project.id }
     end
 
-    context "specifying CSV format" do
-      let(:estimate) { FactoryBot.create(:estimate) }
-      let(:story) { estimate.story }
-      let(:project) { story.project }
-
-      before do
-        get :show, params: {project_id: project.id}, format: :csv
-      end
+    it "redirects to the show page" do
+      expect(response).to render_template :show
+    end
 
-      it "responds with csv formatted report" do
-        csv = CSV.parse(response.body).to_a
-        expect(csv[0]).to eq(["Story", "Best Estimate Average", "Worst Estimate Average"])
-        expect(csv[1]).to eq([story.title, story.best_estimate_average.to_s, story.worst_estimate_average.to_s])
-      end
+    it "shows the attributes for the right project" do
+      expect(assigns(:project)).to eq project
     end
   end
+
+
 end
diff --git a/spec/controllers/stories_controller_spec.rb b/spec/controllers/stories_controller_spec.rb
index c9e677dc..9fd4080b 100644
--- a/spec/controllers/stories_controller_spec.rb
+++ b/spec/controllers/stories_controller_spec.rb
@@ -1,10 +1,10 @@
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe StoriesController, type: :controller do
   render_views
 
   let!(:project) { FactoryBot.create(:project) }
-  let!(:story) { FactoryBot.create(:story, project: project, status: :approved) }
+  let!(:story) { FactoryBot.create(:story, project: project) }
 
   before do
     @request.env["devise.mapping"] = Devise.mappings[:user]
@@ -14,208 +14,102 @@
 
   describe "#new" do
     it "redirects to the new page" do
-      get :new, params: {id: story.id, project_id: project.id}
+      get :new, params: { id: story.id, project_id: project.id }
       expect(response).to render_template :new
     end
   end
 
+  describe "#edit" do
+    before do
+      get :edit, params: { id: story.id, project_id: project.id }
+    end
+
+    it "redirects to the edit page" do
+      expect(response).to render_template :edit
+    end
+
+    it "shows the fields for the story" do
+      expect(assigns(:story)).to eq story
+    end
+  end
+
   describe "#create" do
     context "with valid attributes" do
       let(:valid_params) { FactoryBot.attributes_for(:story) }
 
       it "creates a new story" do
-        expect {
-          post :create, params: {project_id: project.id, story: valid_params}
-        }.to change(Story, :count).by(1)
+        expect do
+          post :create, params: { project_id: project.id, story: valid_params }
+        end.to change(Story, :count).by(1)
       end
 
       it "redirects to the project path" do
-        post :create, params: {project_id: project.id, story: valid_params}
+        post :create, params: { project_id: project.id, :story => valid_params }
 
         expect(response).to redirect_to project_path(project.id)
       end
     end
 
     context "with invalid attributes" do
-      let(:invalid_attributes) { {title: ""} }
+      let(:invalid_attributes) { {:title=>""} }
 
       before do
-        post :create, params: {project_id: project.id, story: invalid_attributes}
+        post :create, params: { project_id: project.id, :story => invalid_attributes }
       end
 
       it "stays on the new template page" do
         expect(response).to render_template :new
       end
+
+      it "shows a flash message" do
+        expect(flash[:error]).to be_present
+      end
     end
   end
 
   describe "#destroy" do
-    it "deletes the story" do
-      expect {
-        delete :destroy, params: {id: story.id, project_id: project.id}
-      }.to change(Story, :count).by(-1)
+  it "deletes the story" do
+      expect do
+        delete :destroy, params: { id: story.id, project_id: project.id }
+      end.to change(Story, :count).by(-1)
     end
   end
 
-  context "when the story project is archived" do
+  describe "#show" do
     before do
-      story.project.toggle_archived!
+      get :show, params: { id: story.id, project_id: project.id }
     end
 
-    it "doesn't allow me to edit the story" do
-      get :edit, params: {id: story.id, project_id: project.id}
-      expect(response).to redirect_to project_path(project)
+    it "redirects to the show page" do
+      expect(response).to render_template :show
     end
 
-    it "doesn't allow me to update the story" do
-      put :update, params: {id: story.id, project_id: project.id, story: {title: "Changed Title"}}
-      expect(response).to redirect_to project_path(project)
-      expect(project.reload.title).not_to eq "Changed Title"
+    it "shows the attributes for the right story" do
+      expect(assigns(:story)).to eq story
     end
   end
 
-  context "when the story project is unarchived" do
-    describe "#show" do
-      before do
-        get :show, params: {id: story.id, project_id: project.id}
-      end
-
-      it "redirects to the show page" do
-        expect(response).to render_template :show
-      end
-
-      it "shows the attributes for the right story" do
-        expect(assigns(:story)).to eq story
-      end
-    end
-
-    describe "#show failure" do
-      it "Throws 404 if the project_id doesn't match the story's project" do
-        expect {
-          get :show, params: {id: story.id, project_id: project.id + 1}
-        }.to raise_error(ActionController::RoutingError)
-      end
-    end
-
-    describe "#edit" do
-      before do
-        get :edit, params: {id: story.id, project_id: project.id}
-      end
-
-      it "redirects to the edit page" do
-        expect(response).to render_template :edit
-      end
-
-      it "shows the fields for the story" do
-        expect(assigns(:story)).to eq story
-      end
-    end
-
-    describe "#update" do
-      it "updates the story" do
-        put :update, params: {id: story.id,
-                              project_id: project.id,
-                              story: {title: "New Story"}}
-
-        expect(story.reload.title).to eq "New Story"
-      end
-    end
-
-    describe "#bulk_destroy" do
-      let(:stories) { FactoryBot.create_list(:story, 2, project: project) }
-
-      it "deletes multiple stories" do
-        ids = stories.map(&:id)
+  describe "#update" do
+    it "updates the story" do
+      put :update, params: { id: story.id,
+                             project_id: project.id,
+                             story: { title: "New Story" }}
 
-        expect {
-          post :bulk_destroy, params: {ids: ids}, format: :json
-        }.to change(Story, :count).by(-2)
-      end
-    end
-
-    describe "#move" do
-      it "does not allow moving stories to non-sibling projects" do
-        project2 = FactoryBot.create(:project, parent: project)
-        project3 = FactoryBot.create(:project)
-        story = FactoryBot.create(:story, project: project2)
-
-        put :move, params: {project_id: project2.id, story_id: story.id, to_project: project3.id}
-        expect(flash[:error]).to eq "Selected project does not exist or is not a sibling."
-        expect(response).to redirect_to project2
-      end
-    end
-
-    describe "#approve" do
-      it "updates the story status to approved" do
-        patch :approve, params: {id: story.id}, format: :js
-
-        expect(story.reload.status).to eq("approved")
-        expect(response).to render_template("shared/update_status")
-      end
-    end
-
-    describe "#reject" do
-      it "updates the story status to rejected" do
-        patch :reject, params: {id: story.id}, format: :js
-
-        expect(story.reload.status).to eq("rejected")
-        expect(response).to render_template("shared/update_status")
-      end
-    end
-
-    describe "#pending" do
-      it "updates the story status to pending" do
-        patch :pending, params: {id: story.id}, format: :js
-
-        expect(story.reload.status).to eq("pending")
-        expect(response).to render_template("shared/update_status")
-      end
+      expect(story.reload.title).to eq "New Story"
     end
+  end
 
-    describe "#export" do
-      it "exports a CSV file with only approved stories" do
-        FactoryBot.create(:story, project: project, status: :rejected)
-        FactoryBot.create(:story, project: project, status: :pending)
-        get :export, params: {project_id: project.id}
-        expect(response).to have_http_status(:ok)
-
-        csv_data = CSV.parse(response.body)
-        expected_csv_content = [
-          ["id", "title", "description", "position"],
-          [story.id.to_s, story.title, story.description, story.position.to_s]
-        ]
-        expect(csv_data).to eq(expected_csv_content)
+  describe "#bulk_destroy" do
+    it "deletes multiple stories" do
+      ids = [99,100]
+      ids.each do |id|
+        FactoryBot.create(:story, id: id, project: project)
       end
 
-      context "with comments" do
-        it "exports a CSV file with only approved stories" do
-          user = FactoryBot.create(:user)
-          story2 = FactoryBot.create(:story, project: project, status: :approved)
-          story3 = FactoryBot.create(:story, project: project, status: :approved)
-          story4 = FactoryBot.create(:story, project: project, status: :approved)
-          FactoryBot.create(:story, project: project, status: :rejected)
-          FactoryBot.create(:story, project: project, status: :pending)
-          comment1 = FactoryBot.create(:comment, user: user, story: story)
-          comment1_2 = FactoryBot.create(:comment, user: user, story: story)
-          comment2_1 = FactoryBot.create(:comment, user: user, story: story2)
-          comment2_2 = FactoryBot.create(:comment, user: user, story: story2)
-          comment3_1 = FactoryBot.create(:comment, user: user, story: story3)
-          get :export, params: {project_id: project.id, export_with_comments: "1"}
-
-          expect(response).to have_http_status(:ok)
-
-          csv_data = CSV.parse(response.body)
-          expected_csv_content = [
-            ["id", "title", "description", "position", "comment"],
-            [story.id.to_s, story.title, story.description, story.position.to_s, "#{comment1.user.name}: #{comment1.body}", "#{comment1_2.user.name}: #{comment1_2.body}"],
-            [story2.id.to_s, story2.title, story2.description, story2.position.to_s, "#{comment2_1.user.name}: #{comment2_1.body}", "#{comment2_2.user.name}: #{comment2_2.body}"],
-            [story3.id.to_s, story3.title, story3.description, story3.position.to_s, "#{comment3_1.user.name}: #{comment3_1.body}"],
-            [story4.id.to_s, story4.title, story4.description, story4.position.to_s]
-          ]
-
-          expect(csv_data).to eq(expected_csv_content)
-        end
-      end
+      expect do
+        post :bulk_destroy, params: {ids: ids}, format: :json
+      end.to change(Story, :count).by(-2)
     end
   end
+
 end
diff --git a/spec/factories/comments.rb b/spec/factories/comments.rb
deleted file mode 100644
index 39556e6c..00000000
--- a/spec/factories/comments.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-FactoryBot.define do
-  factory :comment do
-    body { Faker::ChuckNorris.fact }
-    user
-    story
-  end
-end
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index 701f5e6e..c13cfa65 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -1,12 +1,5 @@
 FactoryBot.define do
   factory :project do
     title { Faker::Company.name }
-    version_jump
-    trait :locked do
-      locked_at { Time.current }
-    end
-    trait :archived do
-      status { "archived" }
-    end
   end
 end
diff --git a/spec/factories/stories.rb b/spec/factories/stories.rb
index a1a9f4b1..e915d5ea 100644
--- a/spec/factories/stories.rb
+++ b/spec/factories/stories.rb
@@ -2,7 +2,6 @@
   factory :story do
     title { Faker::ChuckNorris.fact }
     description { Faker::Marketing.buzzwords }
-    extra_info { Faker::Marketing.buzzwords }
     real_score { 2 }
     project
   end
diff --git a/spec/factories/version_jump.rb b/spec/factories/version_jump.rb
deleted file mode 100644
index 2753b74a..00000000
--- a/spec/factories/version_jump.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-FactoryBot.define do
-  factory :version_jump do
-    sequence(:technology) { |n| ["Rails", "Ruby", "Node", "React"].sample + n.to_s }
-    initial_version { ["2.3", "3.0", "3.1", "3.2", "4.0", "4.1", "4.2"].sample }
-    target_version { ["5.0", "5.1", "5.2", "6.0", "6.1", "7.0"].sample }
-  end
-end
diff --git a/spec/features/action_plan_generate_spec.rb b/spec/features/action_plan_generate_spec.rb
deleted file mode 100644
index 186e201d..00000000
--- a/spec/features/action_plan_generate_spec.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require "rails_helper"
-
-RSpec.describe "generating an action plan", js: true do
-  let(:admin_user) { FactoryBot.create(:user) }
-  let(:parent) do
-    FactoryBot.create(:project)
-  end
-
-  let!(:project) do
-    FactoryBot.create(:project, parent: parent).tap do |project|
-      FactoryBot.create(:story, :approved, title: "Second Story", description: "Second", position: 3, project: project, extra_info: "Extra Information")
-      FactoryBot.create(:story, :approved, title: "First Story", description: "First", position: 1, project: project)
-      FactoryBot.create(:story, :pending, title: "Pending task", description: "Pending description", position: 2, project: project)
-      FactoryBot.create(:story, :rejected, title: "Rejected task", description: "Rejected description", position: 4, project: project)
-    end
-  end
-
-  let!(:project2) do
-    FactoryBot.create(:project, parent: parent).tap do |project|
-      FactoryBot.create(:story, :approved, title: "Third Story", description: "Third", position: 2, project: project)
-      FactoryBot.create(:story, :approved, title: "Forth Story", description: "Forth", position: 1, project: project)
-    end
-  end
-
-  before { login_as(admin_user, scope: :user) }
-
-  it "generates copy pasteable action plan" do
-    visit project_path(project)
-    click_link "Generate Action Plan"
-
-    # Check that content is there
-    expect(page).to have_selector("h1", text: project.title)
-    expect(page).to have_selector("h2", text: "Action Plan")
-    expect(page).to have_selector("input[name='action-plan-prefix']")
-    expect(page).to have_selector("h3.action-plan_heading > span", visible: false)
-    expect(page.all("#action-plan h3").map(&:text)).to eq(["First Story", "Second Story"])
-    # This assertion alsp ensure the extra_info key we populated doesn't appear
-    expect(page.all("#action-plan p").map(&:text)).to eq(["First", "Second"])
-
-    # Set prefix
-    page.fill_in "action-plan-prefix", with: "3.2"
-    expect(page.all(".action-plan_heading > span").map(&:text)).to eq(["3.2.1.", "3.2.2."])
-
-    # Ensure that dot is not there when prefix input is empty
-    page.fill_in "action-plan-prefix", with: " "
-    expect(page.all("#action-plan h3").map(&:text)).to eq(["First Story", "Second Story"])
-  end
-
-  it "generates copy pasteable action plan for nested projects" do
-    visit project_path(parent)
-    click_link "Generate Action Plan"
-
-    # Check that content is there
-    expect(page).to have_selector("h1", text: parent.title)
-    expect(page).to have_selector("h2", text: "Action Plan")
-    expect(page).to have_selector("input[name='action-plan-prefix']")
-
-    # Set prefix
-    page.fill_in "action-plan-prefix", with: "3"
-    expect(page.all(".action-plan_heading > span").map(&:text)).to eq(["3.1.", "3.1.1.", "3.1.2.", "3.2.", "3.2.1.", "3.2.2."])
-  end
-end
diff --git a/spec/features/estimates_manage_spec.rb b/spec/features/estimates_manage_spec.rb
index 0b2bf0e4..4477764a 100644
--- a/spec/features/estimates_manage_spec.rb
+++ b/spec/features/estimates_manage_spec.rb
@@ -1,18 +1,19 @@
-require "rails_helper"
+require 'rails_helper'
 
-RSpec.describe "managing estimates", js: true do
-  let(:user) { FactoryBot.create(:user) }
-  let(:project) { FactoryBot.create(:project) }
-  let!(:story) { FactoryBot.create(:story, project: project) }
+RSpec.describe 'managing estimates' do
+
+  let(:user) {FactoryBot.create(:user)}
+  let(:project) {FactoryBot.create(:project)}
+  let!(:story) {FactoryBot.create(:story, project: project)}
 
   before do
-    login_as(user, scope: :user)
+    login_as(user, :scope => :user)
   end
 
   context "with one unestimated story" do
     before do
       visit project_path(id: project.id)
-      click_link "Add Estimate"
+      click_link 'Add Estimate'
     end
 
     it "shows me the story's title and description" do
@@ -21,28 +22,20 @@
     end
 
     it "allows me to add an estimate" do
-      set_estimates(3, 8)
-      click_button "Save changes"
-      expect(Estimate.count).to eq 1
-
-      expect(page).to have_content "3"
-      expect(page).to have_content "8"
-    end
-
-    it "allows me to add an estimate", js: false do
-      set_estimates(3, 8)
-      click_button "Save changes"
+      select "3", from: "estimate[best_case_points]"
+      select "8", from: "estimate[worst_case_points]"
+      click_button 'Create'
       expect(Estimate.count).to eq 1
       expect(page).to have_content "Estimate created!"
     end
   end
 
   context "with one estimated story" do
-    let!(:estimate) { FactoryBot.create(:estimate, story: story, user: user) }
+    let!(:estimate) {FactoryBot.create(:estimate, story: story, user: user)}
 
     before do
       visit project_path(id: project.id)
-      click_link "Edit Estimate"
+      click_link 'Edit Estimate'
     end
 
     it "shows me the story's title and description" do
@@ -51,123 +44,26 @@
     end
 
     it "allows me to edit an estimate" do
-      set_estimates(1, 2)
-      click_button "Save changes"
-
-      expect(page).to have_content "1"
-      expect(page).to have_content "2"
-    end
-
-    it "allows me to edit an estimate", js: false do
-      set_estimates(1, 2)
-      click_button "Save changes"
+      select "1", from: "estimate[best_case_points]"
+      select "2", from: "estimate[worst_case_points]"
+      click_button 'Save Changes'
       expect(page).to have_content "Estimate updated!"
     end
   end
 
   context "when best case estimate is greater than worst case estimate" do
-    let!(:estimate) { FactoryBot.create(:estimate, story: story, user: user) }
+    let!(:estimate) {FactoryBot.create(:estimate, story: story, user: user)}
 
     before do
       visit project_path(id: project.id)
-      click_link "Edit Estimate"
+      click_link 'Edit Estimate'
     end
 
     it "shows me an error message" do
-      set_estimates(21, 1)
-      click_button "Save changes"
+      select "34", from: "estimate[best_case_points]"
+      select "1", from: "estimate[worst_case_points]"
+      click_button 'Save Changes'
       expect(page).to have_content "Validation error Worst case estimate should be greater than best case estimate."
     end
   end
-
-  context "when the story doesn't have a description" do
-    let!(:story) { FactoryBot.create(:story, project: project, description: nil) }
-
-    before do
-      visit project_path(id: project.id)
-    end
-
-    it "doesn't raise an error" do
-      expect { click_link "Add Estimate" }.to_not raise_error
-    end
-  end
-
-  context "using ajax" do
-    it "uses a modal to estimate" do
-      visit project_path(id: project.id)
-      click_link "Add Estimate"
-
-      within_modal do
-        expect(page).to have_text("New Estimate")
-        expect(page).to have_content(story.description)
-        expect(current_path).to eq project_path(id: project.id)
-
-        set_estimates(3, 8)
-        click_button "Save changes"
-      end
-      expect_closed_modal
-
-      expect_story_estimates(story, 3, 8)
-      expect(page).to_not have_content(story.description)
-
-      click_link "Edit Estimate"
-
-      within_modal do
-        expect(page).to have_text("Edit Estimate")
-        expect(current_path).to eq project_path(id: project.id)
-        expect(page).to have_content(story.description)
-
-        set_estimates(5, 8)
-        click_button "Save changes"
-      end
-      expect_closed_modal
-
-      expect_story_estimates(story, 5, 8)
-
-      click_link "Edit Estimate"
-
-      within_modal do
-        set_estimates(5, 13)
-        click_button "Save changes"
-      end
-      expect_closed_modal
-
-      expect_story_estimates(story, 5, 13)
-    end
-
-    it "allows estimation deletion" do
-      visit project_path(id: project.id)
-      click_link "Add Estimate"
-
-      within_modal do
-        expect(page).to have_text("New Estimate")
-        expect(page).to have_content(story.description)
-        expect(current_path).to eq project_path(id: project.id)
-
-        set_estimates(5, 8)
-
-        # make sure the delete button is not there during creation
-        expect(page).to have_selector("a", text: "Delete Estimate", count: 0)
-
-        click_button "Save changes"
-      end
-      expect_closed_modal
-
-      expect_story_estimates(story, 5, 8)
-      expect(page).to_not have_content(story.description)
-
-      click_link "Edit Estimate"
-
-      within_modal do
-        expect(page).to have_text("Edit Estimate")
-
-        accept_confirm do
-          click_link "Delete Estimate"
-        end
-      end
-      expect_closed_modal
-
-      expect(page).to_not have_text("Edit Estimate")
-    end
-  end
 end
diff --git a/spec/features/home_spec.rb b/spec/features/home_spec.rb
deleted file mode 100644
index e791353b..00000000
--- a/spec/features/home_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require "rails_helper"
-
-RSpec.describe "home specs" do
-  let(:user) { FactoryBot.create(:user) }
-
-  before do
-    login_as(user, scope: :user)
-  end
-
-  context "with projects" do
-    let!(:project) { FactoryBot.create(:project) }
-
-    context "with sub projects" do
-      let!(:sub_project1) { FactoryBot.create(:project, parent: project, position: 1) }
-      let!(:sub_project2) { FactoryBot.create(:project, parent: project, position: 2) }
-      let!(:sub_project3) { FactoryBot.create(:project, parent: project, position: 3) }
-
-      it "allows re-arranging the sub projects", js: true do
-        visit root_path
-
-        first = find("a", text: sub_project1.title)
-        last = find("a", text: sub_project3.title)
-
-        # The use expect_any_instance_of is discouraged by the RSpec team, but the drag_to
-        # method is not always consistent on the distance it drags elements and the order
-        # is not always the expected. So I'm using expect_any_instance_of on purpose here.
-        expect_any_instance_of(ProjectsController).to receive(:sort)
-
-        last.drag_to(first, delay: 0, html5: false)
-
-        expect(page).not_to have_selector("#project_#{project.id}.project-card.sorting")
-      end
-    end
-  end
-end
diff --git a/spec/features/modal_displays_always_spec.rb b/spec/features/modal_displays_always_spec.rb
deleted file mode 100644
index f60f6536..00000000
--- a/spec/features/modal_displays_always_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require "rails_helper"
-
-RSpec.describe "managing estimates", js: true do
-  let(:user) { FactoryBot.create(:user) }
-  let(:project) { FactoryBot.create(:project) }
-  let!(:story) { FactoryBot.create(:story, project: project) }
-
-  before do
-    login_as(user, scope: :user)
-  end
-
-  it "allows me to click on the modal twice in a row" do
-    visit project_path(id: project.id)
-    click_link "Add Estimate"
-
-    within_modal do
-      expect(page).to have_text("New Estimate")
-      expect(page).to have_content(story.description)
-      find(".close").click
-    end
-
-    visit "/projects"
-    find(".project-card:nth-of-type(1)").click
-    click_link "Add Estimate"
-
-    within_modal do
-      expect(page).to have_text("New Estimate")
-      expect(page).to have_content(story.description)
-    end
-  end
-end
diff --git a/spec/features/projects_manage_spec.rb b/spec/features/projects_manage_spec.rb
index 38e0e992..829d6268 100644
--- a/spec/features/projects_manage_spec.rb
+++ b/spec/features/projects_manage_spec.rb
@@ -1,12 +1,12 @@
-require "rails_helper"
+require 'rails_helper'
 
-RSpec.describe "managing projects", js: true do
-  let(:user) { FactoryBot.create(:user) }
-  let(:project) { FactoryBot.create(:project) }
-  let!(:version_jump) { VersionJump.create(technology: "Rails", initial_version: "4.2", target_version: "5.0") }
+RSpec.describe 'managing projects' do
+
+  let(:user) {FactoryBot.create(:user)}
+  let(:project) {FactoryBot.create(:project)}
 
   before do
-    login_as(user, scope: :user)
+    login_as(user, :scope => :user)
   end
 
   it "allows me to sign in" do
@@ -16,465 +16,78 @@
 
   it "allows me to add a project" do
     visit root_path
-    click_link "Add a Project"
-    fill_in "Title", with: "Super Project"
-    select "Rails / 4.2 - 5.0", from: "Version jump"
-
-    expect {
-      click_button "Create"
-    }.to change(Project, :count).by 1
-
-    project = Project.last
-    expect(project.title).to eq "Super Project"
-    expect(project.version_jump.to_label).to eq "Rails / 4.2 - 5.0"
+    click_link 'Add a Project'
+    fill_in 'project[title]', with: "Super Project"
+    click_button 'Create'
+    expect(Project.count).to eq 1
   end
 
-  context "when the project is archived" do
-    before do
-      project.toggle_archived!
-      visit project_path(id: project.id)
-    end
-
-    it "doesn't allow me to change the project" do
-      expect(page).to have_selector(:link_or_button, "Delete Project", disabled: true)
-      expect(page).to have_selector(:link_or_button, "Add Sub-Project", disabled: true)
-    end
-
-    it "allow me to clone the project" do
-      expect(page).to have_selector(:link_or_button, "Clone Project", disabled: false)
-    end
-
-    it "has an archived label" do
-      expect(page).to have_text("archived")
-    end
+  it "allows me to edit a project" do
+    visit project_path(id: project.id)
+    click_link 'Edit or Delete Project'
+    fill_in 'project[title]', with: "New Project"
+    click_button 'Save Changes'
+    expect(page).to have_content "Project updated!"
   end
 
-  context "when the project is unarchived" do
-    it "does not delete a project" do
-      project.update(title: "Awesome Project's Title")
-      visit project_path(id: project.id)
+  it "allows me to delete a project" do
+    visit project_path(id: project.id)
+    click_link 'Edit or Delete Project'
+    click_link 'Delete Project'
+    expect(Project.count).to eq 0
+  end
 
-      click_link "Delete Project"
-      expect(page).to have_content "Are you absolutely sure?"
-      fill_in "project_title", with: "Random Project's Title"
-      click_button "I understand the consequences, delete this project"
+  context "import & Export" do
 
-      expect(page).to have_content "Make sure you added the correct project's title"
+    before do
+      project.stories.create(title: 'php upgrade', description: 'quick php upgrade')
     end
 
-    it "allows me to delete a project" do
+    it "allows me to export a CSV" do
       visit project_path(id: project.id)
-
-      click_link "Delete Project"
-      expect(page).to have_content "Are you absolutely sure?"
-      fill_in "project_title", with: project.title
-      click_button "I understand the consequences, delete this project"
-
-      expect(page).to have_content "Project was successfully destroyed."
+      find('#import-export').click
+      click_on 'Export'
+      expect(page.response_headers['Content-Type']).to eql "text/csv"
+      expect(page.source).to include("php upgrade")
     end
 
-    it "allows editing the project's title inline" do
+    it "allows me to import a CSV" do
       visit project_path(id: project.id)
-
-      within ".dashboard-title" do
-        click_button project.title
-        expect(page).to have_selector("form")
-
-        click_button "Cancel"
-        expect(page).to have_selector("form", count: 0)
-
-        click_button project.title
-        expect(page).to have_selector(" form")
-
-        fill_in "project_title", with: "New Title"
-
-        click_button "Save"
-        expect(page).to have_selector("form", count: 0)
-
-        project.reload
-        expect(project.title).to eq "New Title"
-      end
-    end
-
-    context "Sub-Projects" do
-      it "allows me to add sub projects" do
-        visit project_path(id: project.id)
-        click_link "Add Sub-Project"
-        fill_in "Title", with: "Super Sub Project"
-        expect {
-          click_button "Create"
-        }.to change(Project, :count).by 1
-        expect(current_path).to eq project_path(id: project.id)
-
-        sub = project.projects.last
-        expect(sub.title).to eq "Super Sub Project"
-      end
-
-      it "lists available sub projects with a link" do
-        sub_project_one = FactoryBot.create(:project, title: "Sub-project 1", parent_id: project.id)
-        sub_project_two = FactoryBot.create(:project, title: "Sub-project 2", parent_id: project.id)
-        project_two = FactoryBot.create(:project)
-        visit projects_path
-
-        within(".project-card", text: project.title) do
-          expect(page).to have_link(project.title)
-          expect(page).to_not have_link(project_two.title)
-
-          expect(page).to have_link(sub_project_one.title)
-          expect(page).to have_link(sub_project_two.title)
-        end
-      end
-
-      it "allow me to visit sub-projects with a link" do
-        sub_project_one = FactoryBot.create(:project, title: "Sub-project 1", parent_id: project.id)
-        visit projects_path
-
-        within(".project-card", text: project.title) do
-          expect(page).to have_link(project.title)
-          expect(page).to have_link(sub_project_one.title)
-
-          click_link sub_project_one.title
-        end
-        expect(current_path).to eq project_path(sub_project_one)
-      end
-    end
-
-    context "import & Export" do
-      before do
-        project.stories.create(title: "php upgrade", description: "quick php upgrade", status: :approved)
-      end
-
-      it "allows me to export a CSV", js: false do
-        project.stories.create(title: "pending story", description: "pending stories don't export", status: :pending)
-        project.stories.create(title: "rejected story", description: "rejected stories don't export", status: :rejected)
-        visit project_path(id: project.id)
-        find("#import-export").click
-
-        click_on "Export"
-        expect(page.response_headers["Content-Type"]).to eql "text/csv"
-        expect(page.source).to include("php upgrade")
-      end
-
-      it "allows me to import a CSV" do
-        visit project_path(id: project.id)
-        find("#import-export").click
-        page.attach_file("file", (Rails.root + "spec/fixtures/test.csv").to_s)
-        click_on "Import"
-        expect(project.stories.count).to be > 1
-        expect(project.stories.map(&:title).join).to include("php upgrade")
-        expect(page.text).to include("success")
-        expect(page.current_path).to eql project_path(project.id)
-      end
-
-      it "allows me to update existing stories on import" do
-        csv_path = (Rails.root + "tmp/stories.csv").to_s
-        story = project.stories.first
-        csv_content = "id,title,description,position\n#{story.id},#{story.title},blank!,#{story.position}"
-        File.write(csv_path, csv_content)
-
-        story_count = project.stories.count
-        visit project_path(id: project.id)
-        find("#import-export").click
-        page.attach_file("file", csv_path)
-        click_on "Import"
-        expect(project.stories.count).to be story_count
-        expect(project.stories.map(&:description).join).to_not include("quick")
-      end
-    end
-
-    context "when archiving", js: true do
-      it "allows me to archive a project" do
-        visit project_path(id: project.id)
-        click_link "Archive Project"
-        expect(page).to have_content "Unarchive Project"
-        expect(page).to have_content "archived"
-        expect(project.reload).to be_archived
-      end
-
-      it "archives sub projects" do
-        sub_project = FactoryBot.create(:project, parent: project)
-        visit project_path(id: project.id)
-        click_link "Archive Project"
-        expect(sub_project.reload).to be_archived
-      end
-    end
-
-    context "when unarchiving", js: true do
-      it "allows me to unarchive a project" do
-        project.toggle_archived!
-        visit project_path(id: project.id)
-        click_link "Unarchive Project"
-        expect(page).to have_content "Archive Project"
-        expect(project.reload).not_to be_archived
-      end
-    end
-
-    context "cloning", js: true do
-      it "allows cloning a project" do
-        visit project_path(id: project.id)
-
-        click_link "Clone Project"
-
-        expect(page).to have_text("Clone project #{project.title}")
-
-        fill_in "Title", with: "Cloned Project"
-
-        expect {
-          click_button "Clone"
-        }.to change(Project, :count).by(1)
-
-        expect(page).to have_text("Project cloned")
-
-        last_project = Project.last
-        expect(last_project.id).not_to eq(project.id)
-        expect(last_project.stories.count).to eq project.stories.count
-
-        expect(page).to have_text(last_project.title)
-      end
-
-      it "defaults to same parent" do
-        sub_project = FactoryBot.create(:project, parent: project)
-
-        # None if the project is a parent
-        visit new_clone_project_path(project)
-        expect(page).to have_select(:project_parent_id, selected: "None")
-
-        # The parent if the project is a sub project
-        visit new_clone_project_path(sub_project)
-        expect(page).to have_select(:project_parent_id, selected: project.title)
-      end
-
-      context "picking sub-projects" do
-        let!(:sub_project1) { FactoryBot.create(:project, parent: project) }
-        let!(:sub_project2) { FactoryBot.create(:project, parent: project) }
-        let!(:sub_project3) { FactoryBot.create(:project, parent: project) }
-
-        it "allows selecting which sub-projects to clone" do
-          visit new_clone_project_path(project)
-
-          [sub_project1, sub_project2, sub_project3].each do |sub|
-            expect(page).to have_selector "label", text: sub.title
-          end
-
-          uncheck sub_project2.title
-
-          expect {
-            click_button "Clone"
-          }.to change(Project.parents, :count).by(1)
-
-          expect(page).to have_text("Project cloned")
-
-          last_project = Project.parents.last
-          expect(last_project.id).not_to eq(project.id)
-          expect(last_project.projects.count).to eq 2
-          expect(last_project.projects[0].title).to eq sub_project1.title
-          expect(last_project.projects[1].title).to eq sub_project3.title
-        end
-
-        it "allows to select/unselect all sub-projects at once" do
-          visit new_clone_project_path(project)
-
-          [sub_project1, sub_project2, sub_project3].each do |sub|
-            expect(page).to have_checked_field sub.title
-          end
-
-          click_button "Unselect all"
-
-          [sub_project1, sub_project2, sub_project3].each do |sub|
-            expect(page).to have_selector "label", text: sub.title
-          end
-
-          click_button "Select all"
-
-          [sub_project1, sub_project2, sub_project3].each do |sub|
-            expect(page).to have_checked_field sub.title
-          end
-        end
-
-        it "disallows selecting sub-project if not cloned as parent" do
-          other_parent = FactoryBot.create(:project)
-
-          visit new_clone_project_path(project)
-
-          [sub_project1, sub_project2, sub_project3].each do |sub|
-            expect(page).to have_selector "label", text: sub.title
-          end
-
-          select other_parent.title, from: "Parent"
-
-          [sub_project1, sub_project2, sub_project3].each do |sub|
-            expect(page).to have_selector "label", text: sub.title, count: 0
-          end
-          expect(page).to have_text "Can't clone sub-projects if it's not a parent project"
-        end
-      end
-    end
-  end
-
-  context "hierarchy sidebar" do
-    context "with sub projects" do
-      let!(:sub_project1) { FactoryBot.create(:project, parent: project) }
-      let!(:sub_project2) { FactoryBot.create(:project, parent: project) }
-
-      it "renders a sidebar" do
-        visit project_path(project)
-        within "aside.hierarchy" do
-          expect(page).to have_selector("a", text: project.title)
-          expect(page).to have_selector("a", text: sub_project1.title)
-          expect(page).to have_selector("a", text: sub_project2.title)
-        end
-
-        visit project_path(sub_project1)
-        within "aside.hierarchy" do
-          expect(page).to have_selector("a", text: project.title)
-          expect(page).to have_selector("a", text: sub_project1.title)
-          expect(page).to have_selector("a", text: sub_project2.title)
-        end
-
-        visit project_path(sub_project2)
-        within "aside.hierarchy" do
-          expect(page).to have_selector("a", text: project.title)
-          expect(page).to have_selector("a", text: sub_project1.title)
-          expect(page).to have_selector("a", text: sub_project2.title)
-        end
-      end
-    end
-
-    context "with no sub projects" do
-      it "renders no sidebar" do
-        visit project_path(project)
-
-        expect(page).not_to have_selector("aside.hierarchy")
-      end
+      find('#import-export').click
+      page.attach_file('file', (Rails.root + 'spec/fixtures/test.csv').to_s)
+      click_on 'Import'
+      expect(project.stories.count).to be > 1
+      expect(project.stories.map(&:title).join).to include("php upgrade")
+      expect(page.text).to include("success")
+      expect(page.current_path).to eql project_path(project.id)
+    end
+
+    it "allows me to update existing stories on import" do
+      csv_path = (Rails.root + 'tmp/stories.csv').to_s
+      download_csv_file(csv_path)
+      story_count = project.stories.count
+      visit project_path(id: project.id)
+      find('#import-export').click
+      page.attach_file('file', csv_path)
+      click_on 'Import'
+      expect(project.stories.count).to be story_count
+      expect(project.stories.map(&:description).join).to_not include("quick")
     end
   end
 
-  describe "when locking a project" do
-    context "when a user is an admin" do
-      let(:user) { FactoryBot.create(:user, admin: true) }
-
-      context "if a project is unlocked" do
-        it "locks a project" do
-          visit project_path(id: project.id)
-
-          expect(page).to have_selector(:link_or_button, "Lock Project")
-          click_button "Lock Project"
-
-          expect_buttons_to_be_hidden
-        end
-      end
-    end
-
-    context "when a user is not an admin" do
-      let(:user) { FactoryBot.create(:user) }
-
-      context "if a project is unlocked" do
-        let(:project) { FactoryBot.create(:project) }
-
-        it "does not render locked button" do
-          visit project_path(id: project.id)
-
-          expect(page).to have_no_selector(:link_or_button, "Lock Project")
-        end
-      end
-
-      context "if a project is locked" do
-        let(:locked_project) { FactoryBot.create(:project, :locked) }
-
-        it "does not allow project to be edited" do
-          visit project_path(id: locked_project.id)
-
-          expect_buttons_to_be_hidden
-        end
-
-        it "does not render unlocked button" do
-          visit project_path(id: project.id)
-
-          expect(page).to have_no_selector(:link_or_button, "Unlock Project")
-        end
-      end
-    end
-
-    context "when a project is locked" do
-      let!(:locked_project) { FactoryBot.create(:project, :locked, title: "Some Project") }
-      let(:story) { FactoryBot.create(:story) }
-
-      it "shows a locked label for projects" do
-        visit projects_path
-        within "#projects" do
-          expect(page).to have_text("Locked", count: 1)
-        end
-
-        visit project_path(locked_project)
-        within ".dashboard-title" do
-          expect(page).to have_text("Locked")
-        end
-      end
-
-      it "shows a locked label for archived projects" do
-        archived_project = FactoryBot.create(:project, :locked, :archived)
-        visit projects_path(archived: true)
-        within "#projects" do
-          expect(page).to have_text("Locked", count: 1)
-        end
-
-        visit project_path(archived_project)
-        within ".dashboard-title" do
-          expect(page).to have_text("Locked", count: 1)
-        end
-      end
-
-      it "hides project stories edit and delete buttons" do
-        story.project.update(locked_at: Time.current)
-        visit project_story_path(story.project_id, story.id)
-
-        ["Edit", "Delete"].each do |btn|
-          expect(page).not_to have_selector(:link_or_button, btn)
-        end
-      end
-
-      it "doesn't enable the bulk delete button" do
-        story.project.update(locked_at: Time.current)
-        visit project_path(story.project)
-
-        within "tr#story_#{story.id}" do
-          find("input[type='checkbox'][value='#{story.id}']").set(true)
-        end
-
-        expect(page).to have_button("Bulk Delete", disabled: true)
-      end
-    end
+  def download_csv_file(path)
+    visit project_path(id: project.id)
+    find('#import-export').click
+    click_on 'Export'
+    csv = adjust_csv_descriptions(page.source)
+    File.write(path, csv)
   end
 
-  describe "when unlocking a project" do
-    context "when a user is an admin" do
-      let(:user) { FactoryBot.create(:user, admin: true) }
-
-      context "if a project is locked" do
-        let(:locked_project) { FactoryBot.create(:project, :locked) }
-
-        it "shows an unlocked button" do
-          visit project_path(locked_project)
-          within "div.btn-group.actions" do
-            expect(page).to have_text("Unlock Project")
-          end
-        end
-
-        it "unlocks a project when 'Unlock Project' is clicked" do
-          visit project_path(locked_project)
-          click_button "Unlock Project"
-          within "div.btn-group.actions" do
-            expect(page).to have_text("Lock Project")
-            expect(page).not_to have_text("Unlock Project")
-          end
-        end
-      end
-    end
+  def adjust_csv_descriptions(csv)
+    CSV.parse(csv, headers: true).each do |row|
+      row['description'] = 'blank!'
+    end.to_csv
   end
 
-  def expect_buttons_to_be_hidden
-    ["Delete Project", "Lock Project", "Add Sub-Project", "Add a Story"].each do |btn|
-      expect(page).not_to have_selector(:link_or_button, btn)
-    end
-  end
 end
+
diff --git a/spec/features/real_scores_manage_spec.rb b/spec/features/real_scores_manage_spec.rb
index d388bd99..7bbcfdb7 100644
--- a/spec/features/real_scores_manage_spec.rb
+++ b/spec/features/real_scores_manage_spec.rb
@@ -1,20 +1,21 @@
-require "rails_helper"
+require 'rails_helper'
+require 'apparition_helper'
 
-RSpec.describe "managing real scores", js: true do
-  let!(:user) { FactoryBot.create(:user, :admin, name: "John") }
-  let(:project) { FactoryBot.create(:project) }
-  let!(:story) { FactoryBot.create(:story, project: project) }
+RSpec.describe 'managing real scores', js: !ENV['CI'] do
+
+  let!(:user) {FactoryBot.create(:user, :admin, name: "John")}
+  let(:project) {FactoryBot.create(:project)}
+  let!(:story) {FactoryBot.create(:story, project: project)}
 
   before do
-    login_as(user, scope: :user)
+    login_as(user, :scope => :user)
   end
 
   it "allows me to edit a real score" do
     visit project_report_path(project.id)
-    click_link "Edit Real Scores"
-    expect(page).to have_field("stories[story_#{story.id}]", with: story.real_score.to_s)
-    fill_in "stories[story_#{story.id}]", with: 5
-    click_button "Submit"
+    click_link 'Populate Real Scores'
+    select "5", from: "stories[story_#{story.id}]"
+    click_button 'Submit'
     expect(story.reload.real_score).to eq 5
   end
 end
diff --git a/spec/features/reports_csv_export_spec.rb b/spec/features/reports_csv_export_spec.rb
deleted file mode 100644
index ba2425a2..00000000
--- a/spec/features/reports_csv_export_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require "rails_helper"
-
-RSpec.describe "exporting reports to csv", js: true do
-  let(:user) { FactoryBot.create(:user, :admin) }
-
-  before { login_as(user, scope: :user) }
-
-  context "story has only one estimate" do
-    let(:estimate) { FactoryBot.create(:estimate) }
-    let(:project) { estimate.story.project }
-
-    it "renders download button" do
-      visit project_report_path(project.id)
-      expect(page).not_to have_link "Download Average Estimate Report"
-    end
-  end
-
-  context "story has at least two estimates" do
-    let(:project) { story.project }
-    let(:story) { FactoryBot.create(:story) }
-
-    before { FactoryBot.create_list(:estimate, 2, story: story) }
-
-    it "renders download button" do
-      visit project_report_path(project.id)
-      expect(page).to have_link "Download Average Estimate Report", href: project_report_path(project, format: "csv")
-    end
-  end
-
-  context "with no estimates" do
-    let(:project) { FactoryBot.create(:project) }
-
-    it "does not render download button" do
-      visit project_report_path(project.id)
-      expect(page).not_to have_link "Download Average Estimate Report"
-    end
-  end
-end
diff --git a/spec/features/reports_manage_spec.rb b/spec/features/reports_manage_spec.rb
index 556a1c81..d3fb785d 100644
--- a/spec/features/reports_manage_spec.rb
+++ b/spec/features/reports_manage_spec.rb
@@ -1,12 +1,13 @@
-require "rails_helper"
+require 'rails_helper'
 
-RSpec.describe "managing reports", js: true do
-  let!(:user) { FactoryBot.create(:user, :admin, name: "John") }
-  let!(:project) { FactoryBot.create(:project) }
-  let!(:story) { FactoryBot.create(:story, project: project, real_score: 4) }
+RSpec.describe 'managing reports' do
+
+  let!(:user) {FactoryBot.create(:user, :admin, name: "John")}
+  let!(:project) {FactoryBot.create(:project)}
+  let!(:story) {FactoryBot.create(:story, project: project)}
 
   before do
-    login_as(user, scope: :user)
+    login_as(user, :scope => :user)
   end
 
   it "shows message for no projects" do
@@ -16,6 +17,7 @@
   end
 
   context "with no estimates" do
+
     it "shows no estimates" do
       visit project_report_path(project.id)
       expect(page).to have_content "Not enough estimates"
@@ -23,11 +25,10 @@
   end
 
   context "with one estimate" do
-    let!(:estimate) { FactoryBot.create(:estimate, story: story, user: user) }
+    let!(:estimate) {FactoryBot.create(:estimate, story: story, user: user)}
 
     it "allows me see a report with a project title, list of stories and estimates" do
       visit project_report_path(project.id)
-
       expect(page).to have_content project.title
       expect(page).to have_content story.title
       expect(page).to have_content "#{user.name}'s Best Estimate"
@@ -41,96 +42,21 @@
   end
 
   context "with more than one estimate" do
-    let!(:user_2) { FactoryBot.create(:user, name: "Sarah") }
-    let!(:estimate) do
-      FactoryBot.create(:estimate, story: story, user: user, best_case_points: 1, worst_case_points: 4)
-    end
-    let!(:estimate_2) do
-      FactoryBot.create(:estimate, story: story, user: user_2, best_case_points: 3, worst_case_points: 8)
-    end
-    let(:best_average) { "2.0" }
-    let(:worst_average) { "6.0" }
-    let(:percentage_off_best_average) { "100.00%" }
-    let(:percentage_off_worst_average) { "33.33%" }
-    let!(:best_estimate_total) { 1 }
-    let!(:worst_estimate_total) { 3 }
-    let!(:best_estimate_sum_per_user) { 1 }
-    let!(:worst_estimate_sum_per_user) { 3 }
-
-    it "calculates averages and percentage off estimate" do
-      visit project_report_path(project.id)
-
-      expect(page).to have_content(best_average)
-      expect(page).to have_content(worst_average)
-      expect(page).to have_content(percentage_off_best_average)
-      expect(page).to have_content(percentage_off_worst_average)
-    end
-    let(:best_estimate_total) { "2" }
-    let(:worst_estimate_total) { "6" }
-    let(:real_score_total) { "4" }
-    let(:best_estimate_sum_per_user) { "1" }
-    let(:best_estimate_sum_per_user_2) { "3" }
-    let(:worst_estimate_sum_per_user) { "4" }
-    let(:worst_estimate_sum_per_user_2) { "6" }
-    let(:percentage_off_estimate_total_best) { "100.00%" }
-    let(:percentage_off_estimate_total_worst) { "33.33%" }
-
-    it "calculates totals in the last row" do
+    let!(:user_2) {FactoryBot.create(:user, name: "Sarah")}
+    let!(:estimate) {FactoryBot.create(:estimate, story: story, user: user)}
+    let!(:estimate_2) {FactoryBot.create(:estimate, story: story, user: user_2)}
+    let!(:best_estimate_total) {1}
+    let!(:worst_estimate_total) {3}
+    let!(:best_estimate_sum_per_user) {1}
+    let!(:worst_estimate_sum_per_user) {3}
+
+    it "calculates averages" do
       visit project_report_path(project.id)
-
-      expect(page).to have_content(best_estimate_total)
-      expect(page).to have_content(worst_estimate_total)
-      expect(page).to have_content(real_score_total)
-      expect(page).to have_content(best_estimate_sum_per_user)
-      expect(page).to have_content(best_estimate_sum_per_user_2)
-      expect(page).to have_content(worst_estimate_sum_per_user)
-      expect(page).to have_content(worst_estimate_sum_per_user_2)
-      expect(page).to have_content(percentage_off_estimate_total_best)
-      expect(page).to have_content(percentage_off_estimate_total_worst)
-    end
-
-    # there's a bug that allows estimators to have more than 1 estimate for a given story
-    # even after that bug gets fixed, we have to be sure we handle old data correctly
-    context "by the same user" do
-      let!(:another_estimate) do
-        x = FactoryBot.build(:estimate, story: story, user: user, best_case_points: 8, worst_case_points: 13, created_at: 2.minutes.from_now)
-        x.save(validate: false)
-      end
-
-      it "uses the first estimation" do
-        visit project_report_path(project.id)
-
-        expect(story.estimates.where(user: user).count).to be 2
-
-        within "tbody tr:first-child" do
-          expect(find("td:nth-child(2)")).to have_text "1"
-          expect(find("td:nth-child(3)")).to have_text "4"
-          expect(find("td:nth-child(7)")).to have_text "2"
-          expect(find("td:nth-child(8)")).to have_text "6"
-        end
-
-        within "tfoot tr:first-child" do
-          expect(find("td:nth-child(2)")).to have_text "1"
-          expect(find("td:nth-child(3)")).to have_text "4"
-          expect(find("td:nth-child(7)")).to have_text "2"
-          expect(find("td:nth-child(8)")).to have_text "6"
-        end
-      end
+      expect(page).to have_content best_estimate_total
+      expect(page).to have_content worst_estimate_total
+      expect(page).to have_content best_estimate_sum_per_user
+      expect(page).to have_content worst_estimate_sum_per_user
     end
   end
 
-  context "when a project is locked" do
-    it "shows a locked label for projects on reports page" do
-      locked_project = FactoryBot.create(:project, :locked)
-      visit reports_index_path
-      within "#stories" do
-        expect(page).to have_text("Locked", count: 1)
-      end
-
-      visit project_report_path(locked_project)
-      within ".status-badge.locked" do
-        expect(page).to have_text("Locked")
-      end
-    end
-  end
 end
diff --git a/spec/features/stories_manage_spec.rb b/spec/features/stories_manage_spec.rb
index 5048201f..777cb43a 100644
--- a/spec/features/stories_manage_spec.rb
+++ b/spec/features/stories_manage_spec.rb
@@ -1,370 +1,45 @@
-require "rails_helper"
+require 'rails_helper'
+require 'apparition_helper'
 
-RSpec.describe "managing stories", js: true do
-  let(:user) { FactoryBot.create(:user) }
-  let(:project) { FactoryBot.create(:project) }
-  let!(:story) { FactoryBot.create(:story, project: project) }
+RSpec.describe 'managing stories', js: !ENV['CI'] do
+
+  let(:user) {FactoryBot.create(:user)}
+  let(:project) {FactoryBot.create(:project)}
+  let!(:story) {FactoryBot.create(:story, project: project)}
 
   before do
-    login_as(user, scope: :user)
+    login_as(user, :scope => :user)
   end
 
   it "allows me to add a story" do
     visit project_path(id: project.id)
-    click_link "Add a Story"
-    fill_in "story[title]", with: "As a user, I want to add stories"
-    fill_in "story[description]", with: "This story allows users to add stories."
-    fill_in "story[extra_info]", with: "This story allows users to add extra details."
-    default_status = find(:option, "Pending")
-    expect(default_status).to be_selected
-    click_button "Create"
+    click_link 'Add a Story'
+    fill_in 'story[title]', with: "As a user, I want to add stories"
+    fill_in 'story[description]', with: "This story allows users to add stories."
+    click_button 'Create'
     expect(Story.count).to eq 2
-
-    story = Story.last
-    expect(story.pending?).to be true
-  end
-
-  context "within the new story page" do
-    it "allows me to select a status other than pending" do
-      visit project_path(id: project.id)
-      click_link "Add a Story"
-      fill_in "story[title]", with: "As a user, I want to add stories"
-      fill_in "story[description]", with: "This story allows users to add stories."
-      fill_in "story[extra_info]", with: "This story allows users to add extra details."
-      select "Approved", from: "Status"
-      status = find(:option, "Approved")
-      expect(status).to be_selected
-      click_button "Create"
-
-      story = Story.last
-      expect(story.approved?).to be true
-    end
-
-    it "doesn't have a Rejected option for the status" do
-      visit project_path(id: project.id)
-      click_link "Add a Story"
-      expect { find(:option, "Rejected") }.to raise_error(Capybara::ElementNotFound)
-    end
   end
 
   it "allows me to clone a story" do
     visit project_path(id: project.id)
-    within_story_row(story) do
-      click_button "More actions"
-      click_link "Clone"
-    end
+    within("#story_#{story.id}") {click_link 'Clone'}
     expect(page.find("#story_title").value).to eq story.title
     expect(page.find("#story_description").value).to eq story.description
-    click_button "Create"
+    click_button 'Create'
     expect(Story.count).to eq 2
   end
 
   it "allows me to edit a story" do
     visit project_path(id: project.id)
-    click_button "More actions"
-    click_link "Edit"
-    fill_in "story[title]", with: "As a user, I want to edit stories"
-    click_button "Save Changes"
+    click_link 'Edit'
+    fill_in 'story[title]', with: "As a user, I want to edit stories"
+    click_button 'Save Changes'
     expect(page).to have_content "Story updated!"
   end
 
   it "allows me to delete a story" do
     visit project_path(id: project.id)
-
-    expect(page).to have_text story.title
-
-    accept_confirm do
-      click_button "More actions"
-      click_link "Delete"
-    end
-
-    expect(page).not_to have_text story.title
-    expect(Story.count).to eq 0
-  end
-
-  it "allows me to delete a story from show page" do
-    visit project_story_path(project, story)
-
-    expect(page).to have_text story.title
-
-    accept_confirm do
-      click_link "Delete"
-    end
-
-    expect(page).not_to have_text story.title
-    expect(Story.count).to eq 0
-  end
-
-  it "does not allow me to bulk delete stories when there are none selected" do
-    visit project_path(id: project.id)
-    expect(page).to have_selector("#bulk_delete[aria-disabled='true']")
-    expect(page).to have_selector("#bulk_delete[disabled]")
-  end
-
-  it "allows me to bulk delete stories when one or more stories are selected" do
-    visit project_path(id: project.id)
-
-    within_story_row(story) { check(option: story.id.to_s) }
-    expect(page).to have_no_selector("#bulk_delete[aria-disabled='true']")
-    expect(page).to have_no_selector("#bulk_delete[disabled]")
-    expect(page).to have_button("Bulk Delete (1 Story)")
-    page.accept_confirm "Are you sure you want to delete 1 story?" do
-      click_button("Bulk Delete (1 Story)")
-    end
-    # Make sure tbody empty
-    expect(find("tbody")).to have_no_css("*")
+    click_link 'Delete'
     expect(Story.count).to eq 0
   end
-
-  it "does not bulk delete stories when confirmation is dismissed" do
-    visit project_path(id: project.id)
-
-    within_story_row(story) { check(option: story.id.to_s) }
-    expect(page).to have_no_selector("#bulk_delete[aria-disabled='true']")
-    expect(page).to have_no_selector("#bulk_delete[disabled]")
-    expect(page).to have_button("Bulk Delete (1 Story)")
-    page.dismiss_confirm "Are you sure you want to delete 1 story?" do
-      click_button("Bulk Delete (1 Story)")
-    end
-    expect(Story.count).to eq 1
-  end
-
-  context "previews" do
-    it "shows a preview of the description while typing", js: true do
-      visit project_path(id: project.id)
-      click_link "Add a Story"
-      fill_in "story[title]", with: "As a user, I want to add stories"
-
-      desc = <<~DESC
-        This story allows users to add stories.
-
-            some
-            code
-
-      DESC
-
-      expect(page).to have_text("Description Preview")
-      fill_in "story[description]", with: desc
-      expect(find("#story_description").value).to have_text("This story allows users to add stories.\n\n    some\n    code\n\n")
-
-      within(".story_preview .content") do
-        expect(page).to have_text("This story allows users to add stories.")
-        expect(page).to have_selector("pre", text: "some\ncode")
-      end
-
-      click_button "Create"
-
-      expect(page).to have_text(project.title)
-
-      story = Story.last
-      within_story_row(story) do
-        click_button "More actions"
-        click_link "Edit"
-      end
-
-      expect(page).to have_text("Edit Story")
-
-      within(".story_preview .content") do
-        expect(page).to have_text("This story allows users to add stories.")
-        expect(page).to have_selector("pre", text: "some\ncode")
-      end
-    end
-
-    it "shows a preview of the extra information while typing" do
-      visit project_path(id: project.id)
-      click_link "Add a Story"
-      fill_in "story[title]", with: "As a user, I want to add stories"
-
-      desc = <<~DESC
-        This story allows users to add extra information.
-
-            some
-            codes
-
-      DESC
-
-      expect(page).to have_text("Extra Info Preview")
-      fill_in "story[extra_info]", with: desc
-
-      within(".extra_info_preview .content") do
-        expect(page).to have_selector("p", text: "This story allows users to add extra information.")
-        expect(page).to have_selector("pre", text: "some\ncodes")
-      end
-
-      click_button "Create"
-
-      expect(page).to have_text(project.title)
-
-      story = Story.last
-      within_story_row(story) do
-        click_button "More actions"
-        click_link "Edit"
-      end
-
-      expect(page).to have_text("Edit Story")
-
-      within(".extra_info_preview .content") do
-        expect(page).to have_selector("p", text: "This story allows users to add extra information.")
-        expect(page).to have_selector("pre", text: "some\ncodes")
-      end
-    end
-
-    it "debounces the requests to update the preview to not flood the server" do
-      renderer = double(:markdown_renderer)
-      allow(renderer).to receive(:render).and_return("<span>preview</span>")
-      allow(Redcarpet::Markdown).to receive(:new).and_return(renderer)
-
-      visit project_path(id: project.id)
-      click_link "Add a Story"
-      fill_in "story[title]", with: "As a user, I want to add stories"
-
-      fill_in "story[description]", with: "desc 1"
-      fill_in "story[description]", with: "desc 2"
-      fill_in "story[description]", with: "desc 3"
-
-      # wait until requests are triggered
-      sleep(0.5)
-
-      fill_in "story[description]", with: "desc 4"
-      sleep(0.5)
-
-      # twice for the initial render of the page (description and extra info)
-      # once for the preview of the 3 consecutive inputs
-      # once for the preview of the 4th input
-      expect(renderer).to have_received(:render).exactly(4).times
-    end
-  end
-
-  it "can move stories between siblings" do
-    project2 = FactoryBot.create(:project, parent: project)
-    project3 = FactoryBot.create(:project, parent: project)
-    story = FactoryBot.create(:story, project: project2)
-
-    visit project_path(id: project2.id)
-
-    within_story_row(story) do
-      # move to options are hidden
-      expect(page).not_to have_text project3.title
-
-      click_button "More actions"
-      click_button "Move to"
-
-      # only one option is to move to since there's only one sibling
-      expect(page).to have_selector ".move-story .dropdown > form", count: 1
-
-      # confirm moving the story
-      accept_confirm do
-        click_button project3.title
-      end
-    end
-
-    expect(page).to have_text "Story moved"
-    expect(page).not_to have_text story.title
-    expect(story.reload.project).to eq project3
-  end
-
-  # see issue #9 on github
-  it "preserves order of stories when editing" do
-    empty_project = FactoryBot.create(:project)
-    visit project_path(id: empty_project.id)
-    click_link "Add a Story"
-    fill_in "Title", with: "Story 1"
-    fill_in "Description (Markdown)", with: "desc"
-    click_button "Create"
-
-    # check that it adds a position for new stories
-    story1 = Story.last
-    expect(story1.position).to be 1
-
-    click_link "Add a Story"
-    fill_in "Title", with: "Story 2"
-    fill_in "Description (Markdown)", with: "desc"
-    click_button "Create"
-
-    story2 = Story.last
-    expect(story2.position).to be 2
-
-    # check that the order is not broken after edit for stories with no position
-    story1.update_attribute(:position, nil)
-    story2.update_attribute(:position, nil)
-
-    within("#story_#{story1.id}") do
-      click_button "More actions"
-      click_link "Edit"
-    end
-
-    expect(page).to have_text("Edit Story")
-
-    fill_in "Description (Markdown)", with: "desc2"
-
-    click_button "Save Changes"
-
-    expect(page).to have_text("Story updated!")
-
-    within("#stories") do
-      expect(find("tr:nth-child(1)")).to have_text story1.title
-      expect(find("tr:nth-child(2)")).to have_text story2.title
-    end
-
-    # check that stories with nil position are listed first
-
-    click_link "Add a Story"
-    fill_in "Title", with: "Story 3"
-    fill_in "Description (Markdown)", with: "desc"
-    click_button "Create"
-
-    story3 = Story.last
-    expect(story3.position).to be 1
-
-    within("#stories") do
-      expect(find("tr:nth-child(1)")).to have_text story1.title
-      expect(find("tr:nth-child(2)")).to have_text story2.title
-      expect(find("tr:nth-child(3)")).to have_text story3.title
-    end
-  end
-
-  it "allows sorting stories", js: true do
-    FactoryBot.create(:story, project: project, title: "Juan and Aysan Code!")
-    story3 = FactoryBot.create(:story, project: project, title: "Last story")
-
-    visit project_path(project)
-
-    first = find(".project-table__cell", text: story.title)
-    last = find(".project-table__cell", text: story3.title)
-
-    # The use expect_any_instance_of is discouraged by the RSpec team, but the drag_to
-    # method is not always consistent on the distance it drags elements and the order
-    # is not always the expected. So I'm using expect_any_instance_of on purpose here.
-    expect_any_instance_of(ProjectsController).to receive(:sort_stories)
-
-    last.drag_to(first, delay: 0, html5: false)
-
-    within("#stories") do
-      expect(find("tr:nth-child(1)")).to have_text story3.title
-      expect(find("tr:nth-child(2)")).to have_text story.title
-    end
-
-    expect(page).not_to have_selector(".project-table.sorting")
-  end
-
-  it "filter stories by title or ID", js: true do
-    story4 = FactoryBot.create(:story, project: project, title: "Deprecation warning XYZ")
-    story5 = FactoryBot.create(:story, project: project, title: "Dangerous query method")
-
-    visit project_path(id: project.id)
-
-    fill_in "title_contains", with: "XYZ"
-
-    within("#stories") do
-      expect(find("td:nth-child(1)")).to have_text story4.title
-      expect(all("#stories > tr").count).to eq(1)
-    end
-
-    fill_in "title_contains", with: story5.id
-
-    within("#stories") do
-      expect(find("td:nth-child(1)")).to have_text story5.title
-      expect(all("#stories > tr").count).to eq(1)
-    end
-  end
 end
diff --git a/spec/features/story_show_spec.rb b/spec/features/story_show_spec.rb
deleted file mode 100644
index 45679cf8..00000000
--- a/spec/features/story_show_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-require "rails_helper"
-
-RSpec.describe "story status", js: true do
-  let(:user) { FactoryBot.create(:user) }
-  let(:project) { FactoryBot.create(:project) }
-  let!(:story) { FactoryBot.create(:story, project: project) }
-
-  before do
-    login_as(user, scope: :user)
-  end
-
-  context "from the show page" do
-    it "allows me to change the story status" do
-      visit project_story_path(project_id: project.id, id: story.id)
-
-      status_button = find(".dropdown-wrapper").find("button")
-
-      status_button.click
-      click_button("Approve")
-
-      status_button = find(".dropdown-wrapper").find("button")
-
-      expect(status_button).to have_text("approved")
-    end
-  end
-
-  context "from the estimation modal" do
-    it "allows me to change the story status" do
-      visit project_path(id: project.id)
-      click_link "Add Estimate"
-
-      status_button = find(".story-title").find(".dropdown-wrapper").find("button")
-
-      status_button.click
-      click_button("Approve")
-
-      status_button = find(".story-title").find(".dropdown-wrapper").find("button")
-
-      expect(status_button).to have_text("approved")
-
-      click_button "Save changes"
-
-      status_badge = find(".project-table").find(".status").find(".story-status-badge")
-      expect(status_badge).to have_text("approved")
-    end
-  end
-end
diff --git a/spec/helpers/estimates_helper_spec.rb b/spec/helpers/estimates_helper_spec.rb
deleted file mode 100644
index b22aafda..00000000
--- a/spec/helpers/estimates_helper_spec.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require "rails_helper"
-
-describe EstimatesHelper, type: :helper do
-  describe "#fib_numbers" do
-    it "max option should be [21, 21]" do
-      max_fib_number = helper.fib_numbers.max_by { |f| f[0] }
-      expect(max_fib_number).to eq([21, 21])
-    end
-  end
-end
diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb
deleted file mode 100644
index edb0da0f..00000000
--- a/spec/models/comment_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require "rails_helper"
-
-RSpec.describe Comment, type: :model do
-  subject { FactoryBot.create(:comment) }
-
-  it { should belong_to(:user) }
-  it { should belong_to(:story) }
-  it { should validate_presence_of(:body) }
-end
diff --git a/spec/models/estimate_spec.rb b/spec/models/estimate_spec.rb
index 40100849..a804052d 100644
--- a/spec/models/estimate_spec.rb
+++ b/spec/models/estimate_spec.rb
@@ -1,4 +1,4 @@
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Estimate, type: :model do
   subject { FactoryBot.create(:estimate) }
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 8b51418f..384a8a32 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -1,154 +1,8 @@
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Project, type: :model do
   subject { FactoryBot.create(:project) }
 
-  it { should have_many(:projects).dependent(:destroy) }
   it { should validate_presence_of(:title) }
   it { should have_many(:stories) }
-  it { should belong_to(:parent) }
-
-  it "does not set a position if not a sub project" do
-    parent = FactoryBot.create(:project)
-    expect(parent.position).to be_nil
-  end
-
-  it "sets a position scoped within a parent" do
-    parent = FactoryBot.create(:project)
-    sub_project1 = FactoryBot.create(:project, parent: parent)
-    sub_project2 = FactoryBot.create(:project, parent: parent)
-    expect(sub_project1.position).to eq 1
-    expect(sub_project2.position).to eq 2
-  end
-
-  describe ".sub_projects_with_approved_and_ordered_stories" do
-    it "orders sub projects properly" do
-      parent = FactoryBot.create(:project)
-      sub_project1 = FactoryBot.create(:project, parent: parent, position: 2)
-      story_5 = FactoryBot.create(:story, :approved, project: sub_project1, position: 2)
-      story_4 = FactoryBot.create(:story, :approved, project: sub_project1, position: 1)
-      story_6 = FactoryBot.create(:story, :approved, project: sub_project1, position: 3)
-
-      sub_project2 = FactoryBot.create(:project, parent: parent, position: 1)
-      story_3 = FactoryBot.create(:story, :approved, project: sub_project2, position: 3)
-      story_1 = FactoryBot.create(:story, :approved, project: sub_project2, position: 1)
-      story_2 = FactoryBot.create(:story, :approved, project: sub_project2, position: 2)
-      sub_projects = Project.sub_projects_with_approved_and_ordered_stories(parent.id)
-
-      expect(sub_projects.count).to eq 2
-      expect(sub_projects[0].id).to eq sub_project2.id
-      expect(sub_projects[0].stories[0].id).to eq story_1.id
-      expect(sub_projects[0].stories[1].id).to eq story_2.id
-      expect(sub_projects[0].stories[2].id).to eq story_3.id
-      expect(sub_projects[1].id).to eq sub_project1.id
-      expect(sub_projects[1].stories[0].id).to eq story_4.id
-      expect(sub_projects[1].stories[1].id).to eq story_5.id
-      expect(sub_projects[1].stories[2].id).to eq story_6.id
-    end
-  end
-
-  describe "#archived?" do
-    it "returns true if status is archived" do
-      expect(Project.new(status: "archived")).to be_archived
-    end
-
-    it "returns false if status is not `archived`" do
-      expect(Project.new(status: nil)).not_to be_archived
-    end
-
-    it "returns true if the parent is archived" do
-      parent = FactoryBot.create(:project, status: "archived")
-      sub_project1 = FactoryBot.create(:project, parent: parent)
-
-      expect(sub_project1).to be_archived
-    end
-
-    it "returns false if the parent is not archived" do
-      parent = FactoryBot.create(:project)
-      sub_project1 = FactoryBot.create(:project, parent: parent)
-
-      expect(sub_project1).not_to be_archived
-    end
-  end
-
-  describe "#toggle_archived!" do
-    context "when unarchived" do
-      before(:each) do
-        subject.update_column :status, nil
-      end
-
-      it "archives the project" do
-        subject.toggle_archived!
-        expect(subject.reload).to be_archived
-      end
-
-      it "archives sub projects" do
-        add_sub_project
-
-        subject.toggle_archived!
-
-        expect(subject.projects).to_not be_empty
-        subject.projects.each do |project|
-          expect(project).to be_archived
-        end
-      end
-    end
-
-    context "when archived" do
-      before(:each) do
-        subject.update_column :status, "archived"
-      end
-
-      it "unarchives the project" do
-        subject.toggle_archived!
-        expect(subject.reload).to_not be_archived
-      end
-
-      it "unarchives sub projects" do
-        add_sub_project
-
-        subject.toggle_archived!
-
-        expect(subject.projects).to_not be_empty
-        subject.projects.each do |project|
-          expect(project).to_not be_archived
-        end
-      end
-    end
-
-    it "won't update a sub project" do
-      parent = FactoryBot.create(:project)
-      sub_project1 = FactoryBot.create(:project, parent: parent)
-      sub_project2 = FactoryBot.create(:project, parent: parent, status: "archived")
-
-      expect(sub_project1).to_not be_archived
-      expect(sub_project1.toggle_archived!).to eql(nil)
-      sub_project1.reload
-      expect(sub_project1).to_not be_archived
-
-      expect(sub_project2).to_not be_archived
-      expect(sub_project2.toggle_archived!).to eql(nil)
-      sub_project2.reload
-      expect(sub_project2).to_not be_archived
-    end
-  end
-
-  describe "#cloning behaviour" do
-    it "clones stories into the new project but does not copy status" do
-      original_project = FactoryBot.create(:project)
-      FactoryBot.create(:story, :approved, project: original_project, position: 2)
-      FactoryBot.create(:story, :rejected, project: original_project, position: 1)
-      FactoryBot.create(:story, :pending, project: original_project, position: 3)
-
-      new_project = FactoryBot.create(:project)
-      original_project.clone_stories_into(new_project)
-      new_project.stories.each do |story|
-        expect(story).to be_pending
-      end
-    end
-  end
-
-  def add_sub_project
-    FactoryBot.create(:project, parent: subject, status: subject.status)
-  end
 end
diff --git a/spec/models/story_spec.rb b/spec/models/story_spec.rb
index 737f4d5d..f15dd86c 100644
--- a/spec/models/story_spec.rb
+++ b/spec/models/story_spec.rb
@@ -1,15 +1,13 @@
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Story, type: :model do
-  subject { FactoryBot.create(:story, real_score: real_score) }
-  let(:real_score) { 1 }
+  subject { FactoryBot.create(:story) }
 
   it { should validate_presence_of(:title) }
 
   it { should belong_to(:project) }
 
-  let(:user) { FactoryBot.create(:user) }
-  let(:user2) { FactoryBot.create(:user) }
+  let!(:user) { FactoryBot.create(:user) }
 
   describe "#best_estimate_average" do
     context "there are no estimates" do
@@ -31,7 +29,7 @@
     end
     context "there are two or more estimates" do
       let(:estimate_1) { Estimate.new(best_case_points: 10, worst_case_points: 20, user: user) }
-      let(:estimate_2) { Estimate.new(best_case_points: 100, worst_case_points: 200, user: user2) }
+      let(:estimate_2) { Estimate.new(best_case_points: 100, worst_case_points: 200, user: user) }
 
       subject {
         result = FactoryBot.create(:story)
@@ -45,42 +43,6 @@
     end
   end
 
-  describe "#percentage_off_estimate" do
-    context "when average is 0" do
-      let(:estimate_average) { 0 }
-
-      it "returns 0" do
-        expect(subject.percentage_off_estimate(estimate_average)).to eq(0)
-      end
-    end
-
-    context "when average is > 0" do
-      let(:average) { 1 }
-
-      context "when real_score is the same" do
-        it "returns 0 because estimate was on point" do
-          expect(subject.percentage_off_estimate(average)).to eq(0)
-        end
-      end
-
-      context "when real_score is twice the average" do
-        let(:real_score) { average * 2 }
-
-        it "returns 100% off" do
-          expect(subject.percentage_off_estimate(average)).to eq(100)
-        end
-      end
-
-      context "when real_score is nil (by default it's nil)" do
-        let(:real_score) { nil }
-
-        it "returns 0" do
-          expect(subject.percentage_off_estimate(average)).to eq(0)
-        end
-      end
-    end
-  end
-
   describe "#worst_estimate_average" do
     context "there are no estimates" do
       it "returns 0" do
@@ -99,10 +61,9 @@
         expect(subject.worst_estimate_average).to eq(0)
       end
     end
-
     context "there are two or more estimates" do
       let(:estimate_1) { Estimate.new(best_case_points: 10, worst_case_points: 20, user: user) }
-      let(:estimate_2) { Estimate.new(best_case_points: 100, worst_case_points: 200, user: user2) }
+      let(:estimate_2) { Estimate.new(best_case_points: 100, worst_case_points: 200, user: user) }
 
       subject {
         result = FactoryBot.create(:story)
@@ -115,14 +76,4 @@
       end
     end
   end
-
-  describe ".approved" do
-    it "returns only approved stories" do
-      approved_stories = FactoryBot.create_list(:story, 2, :approved)
-      FactoryBot.create(:story, :rejected)
-      FactoryBot.create(:story, :pending)
-
-      expect(Story.approved.map(&:id).sort).to eq(approved_stories.map(&:id).sort)
-    end
-  end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 79e8c72b..45bed871 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,27 +1,29 @@
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe User, type: :model do
   subject { FactoryBot.create(:user) }
 
   describe "Class Methods" do
+
     describe ".from_omniauth" do
       let(:auth) do
-        RecursiveOpenStruct.new(provider: "github",
-          uid: "uuiidd11",
-          info: {email: "testuser@email.com", name: "TestUser"})
+        RecursiveOpenStruct.new(provider: 'github',
+                                uid: 'uuiidd11',
+                                info: {email: "testuser@email.com", name: "TestUser"}
+                                )
       end
 
       it "creates a user" do
         expect {
           User.from_omniauth(auth)
-        }.to change { User.count }
+          }.to change { User.count }
       end
 
       it "updates an existing user" do
         User.from_omniauth(auth)
-        auth.info.name = "benjamin"
+        auth.info.name = 'benjamin'
         User.from_omniauth(auth)
-        expect(User.last.name).to eql "benjamin"
+        expect(User.last.name).to eql 'benjamin'
       end
 
       it "returns a user record" do
diff --git a/spec/models/version_jump_spec.rb b/spec/models/version_jump_spec.rb
deleted file mode 100644
index 461ff6ce..00000000
--- a/spec/models/version_jump_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require "rails_helper"
-
-RSpec.describe VersionJump, type: :model do
-  subject { FactoryBot.create(:version_jump) }
-
-  it "should be uniq by technology, initial version, and target version" do
-    attrs = {
-      technology: "Rails",
-      initial_version: "4.2",
-      target_version: "5.0"
-    }
-
-    jump1 = VersionJump.create(attrs)
-    expect(jump1).to be_persisted
-
-    jump2 = VersionJump.new(attrs)
-    expect(jump2).to be_invalid
-    expect(jump2.errors[:technology]).to be_present
-
-    jump2.technology = "Ruby"
-    expect(jump2).to be_valid
-
-    jump2.technology = attrs[:technology]
-    jump2.initial_version = "4.1"
-    expect(jump2).to be_valid
-
-    jump2.initial_version = attrs[:initial_version]
-    jump2.target_version = "5.1"
-    expect(jump2).to be_valid
-  end
-end
diff --git a/spec/policies/project_policy_spec.rb b/spec/policies/project_policy_spec.rb
deleted file mode 100644
index ab4c5eff..00000000
--- a/spec/policies/project_policy_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require "rails_helper"
-
-describe ProjectPolicy do
-  subject { described_class }
-
-  permissions :update? do
-    let(:user) { FactoryBot.build(:user) }
-    let(:locked_project) { FactoryBot.create(:project, locked_at: Time.current) }
-    let(:project) { FactoryBot.create(:project, locked_at: nil) }
-
-    context "when project doesn't belong to a parent project" do
-      it "denies access if project is locked" do
-        expect(subject).not_to permit(user, locked_project)
-      end
-
-      it "grants access if project is not locked" do
-        expect(subject).to permit(user, project)
-      end
-    end
-
-    context "when sub project belongs to a locked parent" do
-      let(:sub_project) { FactoryBot.build_stubbed(:project, locked_at: nil, parent: locked_project) }
-
-      it "denies access" do
-        expect(subject).not_to permit(user, sub_project)
-      end
-    end
-
-    context "when sub project belongs to an unlocked parent" do
-      let(:sub_project) { FactoryBot.build_stubbed(:project, locked_at: nil) }
-
-      it "grants access" do
-        expect(subject).to permit(user, sub_project)
-      end
-    end
-  end
-end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 7accd23a..16b85957 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -1,23 +1,13 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
-require "spec_helper"
-ENV["RAILS_ENV"] ||= "test"
-require File.expand_path("../../config/environment", __FILE__)
+require 'spec_helper'
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
 # Prevent database truncation if the environment is production
 abort("The Rails environment is running in production mode!") if Rails.env.production?
-require "rspec/rails"
-require "capybara/rspec"
+require 'rspec/rails'
+require 'capybara/rspec'
 # Add additional requires below this line. Rails is not loaded until this point!
 
-# When updating Capybara check if we still need this, newer versions already include this config
-# https://github.com/teamcapybara/capybara/blob/c7c22789b7aaf6c1515bf6e68f00bfe074cf8fc1/lib/capybara/registrations/drivers.rb
-Capybara.register_driver :headless_firefox do |app|
-  browser_options = ::Selenium::WebDriver::Firefox::Options.new
-  browser_options.args << "-headless"
-  Capybara::Selenium::Driver.new(app, browser: :firefox, options: browser_options)
-end
-Capybara.javascript_driver = :headless_firefox
-Capybara.server = :puma, {Silent: true}
-
 # Requires supporting ruby files with custom matchers and macros, etc, in
 # spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
 # run as spec files by default. This means that files in spec/support that end
@@ -37,49 +27,7 @@
 # If you are not using ActiveRecord, you can remove this line.
 ActiveRecord::Migration.maintain_test_schema!
 
-require "deprecation_tracker"
-
-module FeatureSpecsHelpers
-  def set_estimates(best, worst)
-    select best.to_s, from: "estimate[best_case_points]"
-    select worst.to_s, from: "estimate[worst_case_points]"
-  end
-
-  def within_story_row(story, &block)
-    within "#story_#{story.id}" do
-      yield
-    end
-  end
-
-  def within_modal(&block)
-    within ".modal.in" do
-      yield
-    end
-  end
-
-  def expect_closed_modal
-    expect(page).to have_selector ".modal.in", count: 0
-  end
-
-  def expect_story_estimates(story, best, worst)
-    within_story_row(story) do
-      expect(find("td:nth-child(3)")).to have_text best.to_s
-      expect(find("td:nth-child(4)")).to have_text worst.to_s
-    end
-  end
-end
-
-# TODO: remove when rspec-rails is fixed for Rails 7
-# This PR in the main Rails branch https://github.com/rails/rails/pull/43734
-# added a call to the `executor_around_each_request` method
-# that it's not yet supported in RSpec
-# After updating RSpec when Rails 7 is released we will probably be able
-# to delete this
-module RSpec::Rails::RailsExampleGroup
-  def executor_around_each_request
-    true
-  end
-end
+require 'deprecation_tracker'
 
 RSpec.configure do |config|
   # Tracker deprecation messages in each file
@@ -88,7 +36,7 @@ def executor_around_each_request
       config,
       shitlist_path: "spec/support/deprecation_warning.shitlist.json",
       mode: ENV["DEPRECATION_TRACKER"],
-      transform_message: ->(message) { message.gsub("#{Rails.root}/", "") }
+      transform_message: -> (message) { message.gsub("#{Rails.root}/", "") }
     )
   end
 
@@ -110,7 +58,6 @@ def executor_around_each_request
   end
 
   config.include Devise::Test::ControllerHelpers, type: :controller
-  config.include FeatureSpecsHelpers, type: :feature
 
   # RSpec Rails can automatically mix in different behaviours to your tests
   # based on their file location, for example enabling you to call `get` and
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 93e48875..9d9e1c46 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,9 +1,8 @@
-require "faker"
-require "pundit/rspec"
+require 'faker'
 
-if ENV["COVERAGE"] == "true"
-  require "simplecov"
-  SimpleCov.start "rails"
+if ENV['COVERAGE'] == 'true'
+  require 'simplecov'
+  SimpleCov.start 'rails'
 end
 
 # This file was generated by the `rails generate rspec:install` command. Conventionally, all
@@ -52,42 +51,43 @@
   # triggering implicit auto-inclusion in groups with matching metadata.
   config.shared_context_metadata_behavior = :apply_to_host_groups
 
-  # The settings below are suggested to provide a good initial experience
-  # with RSpec, but feel free to customize to your heart's content.
-  #   # This allows you to limit a spec run to individual examples or groups
-  #   # you care about by tagging them with `:focus` metadata. When nothing
-  #   # is tagged with `:focus`, all examples get run. RSpec also provides
-  #   # aliases for `it`, `describe`, and `context` that include `:focus`
-  #   # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
-  #   config.filter_run_when_matching :focus
-  #
-  #   # Allows RSpec to persist some state between runs in order to support
-  #   # the `--only-failures` and `--next-failure` CLI options. We recommend
-  #   # you configure your source control system to ignore this file.
-  #   config.example_status_persistence_file_path = "spec/examples.txt"
-  #
-  #   # Limits the available syntax to the non-monkey patched syntax that is
-  #   # recommended. For more details, see:
-  #   #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
-  #   #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
-  #   config.disable_monkey_patching!
-  #
-  #   # Many RSpec users commonly either run the entire suite or an individual
-  #   # file, and it's useful to allow more verbose output when running an
-  #   # individual spec file.
-  #   if config.files_to_run.one?
-  #     # Use the documentation formatter for detailed output,
-  #     # unless a formatter has already been configured
-  #     # (e.g. via a command-line flag).
-  #     config.default_formatter = "doc"
-  #   end
-  #
-  #   # Print the 10 slowest examples and example groups at the
-  #   # end of the spec run, to help surface which specs are running
-  #   # particularly slow.
-  #   config.profile_examples = 10
-  #
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  config.disable_monkey_patching!
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = "doc"
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
@@ -99,4 +99,5 @@
   # test failures related to randomization by passing the same `--seed` value
   # as the one that triggered the failure.
   Kernel.srand config.seed
+=end
 end
diff --git a/spec/zeitwerk_check.rb b/spec/zeitwerk_check.rb
deleted file mode 100644
index cb95215d..00000000
--- a/spec/zeitwerk_check.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "rails_helper"
-
-RSpec.describe "Zeitwerk compliance" do
-  it "eager loads all files without errors" do
-    expect { Rails.application.eager_load! }.not_to raise_error
-  end
-end
diff --git a/vendor/assets/javascripts/clipboard.min.js b/vendor/assets/javascripts/clipboard.min.js
deleted file mode 100644
index 54b3c463..00000000
--- a/vendor/assets/javascripts/clipboard.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * clipboard.js v2.0.8
- * https://clipboardjs.com/
- *
- * Licensed MIT © Zeno Rocha
- */
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.ClipboardJS=e():t.ClipboardJS=e()}(this,function(){return n={686:function(t,e,n){"use strict";n.d(e,{default:function(){return o}});var e=n(279),i=n.n(e),e=n(370),u=n.n(e),e=n(817),c=n.n(e);function a(t){try{return document.execCommand(t)}catch(t){return}}var f=function(t){t=c()(t);return a("cut"),t};var l=function(t){var e,n,o,r=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{container:document.body},i="";return"string"==typeof t?(e=t,n="rtl"===document.documentElement.getAttribute("dir"),(o=document.createElement("textarea")).style.fontSize="12pt",o.style.border="0",o.style.padding="0",o.style.margin="0",o.style.position="absolute",o.style[n?"right":"left"]="-9999px",n=window.pageYOffset||document.documentElement.scrollTop,o.style.top="".concat(n,"px"),o.setAttribute("readonly",""),o.value=e,o=o,r.container.appendChild(o),i=c()(o),a("copy"),o.remove()):(i=c()(t),a("copy")),i};function r(t){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}var s=function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{},e=t.action,n=void 0===e?"copy":e,o=t.container,e=t.target,t=t.text;if("copy"!==n&&"cut"!==n)throw new Error('Invalid "action" value, use either "copy" or "cut"');if(void 0!==e){if(!e||"object"!==r(e)||1!==e.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===n&&e.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===n&&(e.hasAttribute("readonly")||e.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes')}return t?l(t,{container:o}):e?"cut"===n?f(e):l(e,{container:o}):void 0};function d(t){return(d="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function p(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}function y(t,e){return(y=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function h(n){var o=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(t){return!1}}();return function(){var t,e=m(n);return t=o?(t=m(this).constructor,Reflect.construct(e,arguments,t)):e.apply(this,arguments),e=this,!(t=t)||"object"!==d(t)&&"function"!=typeof t?function(t){if(void 0!==t)return t;throw new ReferenceError("this hasn't been initialised - super() hasn't been called")}(e):t}}function m(t){return(m=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function v(t,e){t="data-clipboard-".concat(t);if(e.hasAttribute(t))return e.getAttribute(t)}var o=function(){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&y(t,e)}(r,i());var t,e,n,o=h(r);function r(t,e){var n;return function(t){if(!(t instanceof r))throw new TypeError("Cannot call a class as a function")}(this),(n=o.call(this)).resolveOptions(e),n.listenClick(t),n}return t=r,n=[{key:"copy",value:function(t){var e=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{container:document.body};return l(t,e)}},{key:"cut",value:function(t){return f(t)}},{key:"isSupported",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:["copy","cut"],t="string"==typeof t?[t]:t,e=!!document.queryCommandSupported;return t.forEach(function(t){e=e&&!!document.queryCommandSupported(t)}),e}}],(e=[{key:"resolveOptions",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{};this.action="function"==typeof t.action?t.action:this.defaultAction,this.target="function"==typeof t.target?t.target:this.defaultTarget,this.text="function"==typeof t.text?t.text:this.defaultText,this.container="object"===d(t.container)?t.container:document.body}},{key:"listenClick",value:function(t){var e=this;this.listener=u()(t,"click",function(t){return e.onClick(t)})}},{key:"onClick",value:function(t){var e=t.delegateTarget||t.currentTarget,t=s({action:this.action(e),container:this.container,target:this.target(e),text:this.text(e)});this.emit(t?"success":"error",{action:this.action,text:t,trigger:e,clearSelection:function(){e&&e.focus(),document.activeElement.blur(),window.getSelection().removeAllRanges()}})}},{key:"defaultAction",value:function(t){return v("action",t)}},{key:"defaultTarget",value:function(t){t=v("target",t);if(t)return document.querySelector(t)}},{key:"defaultText",value:function(t){return v("text",t)}},{key:"destroy",value:function(){this.listener.destroy()}}])&&p(t.prototype,e),n&&p(t,n),r}()},828:function(t){var e;"undefined"==typeof Element||Element.prototype.matches||((e=Element.prototype).matches=e.matchesSelector||e.mozMatchesSelector||e.msMatchesSelector||e.oMatchesSelector||e.webkitMatchesSelector),t.exports=function(t,e){for(;t&&9!==t.nodeType;){if("function"==typeof t.matches&&t.matches(e))return t;t=t.parentNode}}},438:function(t,e,n){var u=n(828);function i(t,e,n,o,r){var i=function(e,n,t,o){return function(t){t.delegateTarget=u(t.target,n),t.delegateTarget&&o.call(e,t)}}.apply(this,arguments);return t.addEventListener(n,i,r),{destroy:function(){t.removeEventListener(n,i,r)}}}t.exports=function(t,e,n,o,r){return"function"==typeof t.addEventListener?i.apply(null,arguments):"function"==typeof n?i.bind(null,document).apply(null,arguments):("string"==typeof t&&(t=document.querySelectorAll(t)),Array.prototype.map.call(t,function(t){return i(t,e,n,o,r)}))}},879:function(t,n){n.node=function(t){return void 0!==t&&t instanceof HTMLElement&&1===t.nodeType},n.nodeList=function(t){var e=Object.prototype.toString.call(t);return void 0!==t&&("[object NodeList]"===e||"[object HTMLCollection]"===e)&&"length"in t&&(0===t.length||n.node(t[0]))},n.string=function(t){return"string"==typeof t||t instanceof String},n.fn=function(t){return"[object Function]"===Object.prototype.toString.call(t)}},370:function(t,e,n){var f=n(879),l=n(438);t.exports=function(t,e,n){if(!t&&!e&&!n)throw new Error("Missing required arguments");if(!f.string(e))throw new TypeError("Second argument must be a String");if(!f.fn(n))throw new TypeError("Third argument must be a Function");if(f.node(t))return c=e,a=n,(u=t).addEventListener(c,a),{destroy:function(){u.removeEventListener(c,a)}};if(f.nodeList(t))return o=t,r=e,i=n,Array.prototype.forEach.call(o,function(t){t.addEventListener(r,i)}),{destroy:function(){Array.prototype.forEach.call(o,function(t){t.removeEventListener(r,i)})}};if(f.string(t))return t=t,e=e,n=n,l(document.body,t,e,n);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList");var o,r,i,u,c,a}},817:function(t){t.exports=function(t){var e,n="SELECT"===t.nodeName?(t.focus(),t.value):"INPUT"===t.nodeName||"TEXTAREA"===t.nodeName?((e=t.hasAttribute("readonly"))||t.setAttribute("readonly",""),t.select(),t.setSelectionRange(0,t.value.length),e||t.removeAttribute("readonly"),t.value):(t.hasAttribute("contenteditable")&&t.focus(),n=window.getSelection(),(e=document.createRange()).selectNodeContents(t),n.removeAllRanges(),n.addRange(e),n.toString());return n}},279:function(t){function e(){}e.prototype={on:function(t,e,n){var o=this.e||(this.e={});return(o[t]||(o[t]=[])).push({fn:e,ctx:n}),this},once:function(t,e,n){var o=this;function r(){o.off(t,r),e.apply(n,arguments)}return r._=e,this.on(t,r,n)},emit:function(t){for(var e=[].slice.call(arguments,1),n=((this.e||(this.e={}))[t]||[]).slice(),o=0,r=n.length;o<r;o++)n[o].fn.apply(n[o].ctx,e);return this},off:function(t,e){var n=this.e||(this.e={}),o=n[t],r=[];if(o&&e)for(var i=0,u=o.length;i<u;i++)o[i].fn!==e&&o[i].fn._!==e&&r.push(o[i]);return r.length?n[t]=r:delete n[t],this}},t.exports=e,t.exports.TinyEmitter=e}},r={},o.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return o.d(e,{a:e}),e},o.d=function(t,e){for(var n in e)o.o(e,n)&&!o.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:e[n]})},o.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},o(686).default;function o(t){if(r[t])return r[t].exports;var e=r[t]={exports:{}};return n[t](e,e.exports,o),e.exports}var n,r});
\ No newline at end of file