diff --git a/app/assets/stylesheets/friends.scss b/app/assets/stylesheets/friends.scss
new file mode 100644
index 0000000..44c2b0a
--- /dev/null
+++ b/app/assets/stylesheets/friends.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the friends controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: https://sass-lang.com/
diff --git a/app/controllers/friends_controller.rb b/app/controllers/friends_controller.rb
new file mode 100644
index 0000000..354a8d6
--- /dev/null
+++ b/app/controllers/friends_controller.rb
@@ -0,0 +1,74 @@
+class FriendsController < ApplicationController
+  before_action :set_friend, only: [:show, :edit, :update, :destroy]
+
+  # GET /friends
+  # GET /friends.json
+  def index
+    @friends = Friend.all
+  end
+
+  # GET /friends/1
+  # GET /friends/1.json
+  def show
+  end
+
+  # GET /friends/new
+  def new
+    @friend = Friend.new
+  end
+
+  # GET /friends/1/edit
+  def edit
+  end
+
+  # POST /friends
+  # POST /friends.json
+  def create
+    @friend = Friend.new(friend_params)
+
+    respond_to do |format|
+      if @friend.save
+        format.html { redirect_to @friend, notice: 'Friend was successfully created.' }
+        format.json { render :show, status: :created, location: @friend }
+      else
+        format.html { render :new }
+        format.json { render json: @friend.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /friends/1
+  # PATCH/PUT /friends/1.json
+  def update
+    respond_to do |format|
+      if @friend.update(friend_params)
+        format.html { redirect_to @friend, notice: 'Friend was successfully updated.' }
+        format.json { render :show, status: :ok, location: @friend }
+      else
+        format.html { render :edit }
+        format.json { render json: @friend.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /friends/1
+  # DELETE /friends/1.json
+  def destroy
+    @friend.destroy
+    respond_to do |format|
+      format.html { redirect_to friends_url, notice: 'Friend was successfully destroyed.' }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_friend
+      @friend = Friend.find(params[:id])
+    end
+
+    # Only allow a list of trusted parameters through.
+    def friend_params
+      params.require(:friend).permit(:first_name, :last_name, :email, :phone, :twitter)
+    end
+end
diff --git a/app/helpers/friends_helper.rb b/app/helpers/friends_helper.rb
new file mode 100644
index 0000000..0b69e9b
--- /dev/null
+++ b/app/helpers/friends_helper.rb
@@ -0,0 +1,2 @@
+module FriendsHelper
+end
diff --git a/app/models/friend.rb b/app/models/friend.rb
new file mode 100644
index 0000000..863a36a
--- /dev/null
+++ b/app/models/friend.rb
@@ -0,0 +1,2 @@
+class Friend < ApplicationRecord
+end
diff --git a/app/views/friends/_form.html.erb b/app/views/friends/_form.html.erb
new file mode 100644
index 0000000..d7dd541
--- /dev/null
+++ b/app/views/friends/_form.html.erb
@@ -0,0 +1,42 @@
+<%= form_with(model: friend) do |form| %>
+  <% if friend.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(friend.errors.count, "error") %> prohibited this friend from being saved:</h2>
+
+      <ul>
+        <% friend.errors.each do |error| %>
+          <li><%= error.full_message %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= form.label :first_name %>
+    <%= form.text_field :first_name %>
+  </div>
+
+  <div class="field">
+    <%= form.label :last_name %>
+    <%= form.text_field :last_name %>
+  </div>
+
+  <div class="field">
+    <%= form.label :email %>
+    <%= form.text_field :email %>
+  </div>
+
+  <div class="field">
+    <%= form.label :phone %>
+    <%= form.text_field :phone %>
+  </div>
+
+  <div class="field">
+    <%= form.label :twitter %>
+    <%= form.text_field :twitter %>
+  </div>
+
+  <div class="actions">
+    <%= form.submit %>
+  </div>
+<% end %>
diff --git a/app/views/friends/_friend.json.jbuilder b/app/views/friends/_friend.json.jbuilder
new file mode 100644
index 0000000..e7c78da
--- /dev/null
+++ b/app/views/friends/_friend.json.jbuilder
@@ -0,0 +1,2 @@
+json.extract! friend, :id, :first_name, :last_name, :email, :phone, :twitter, :created_at, :updated_at
+json.url friend_url(friend, format: :json)
diff --git a/app/views/friends/edit.html.erb b/app/views/friends/edit.html.erb
new file mode 100644
index 0000000..aa0abe1
--- /dev/null
+++ b/app/views/friends/edit.html.erb
@@ -0,0 +1,6 @@
+<h1>Editing Friend</h1>
+
+<%= render 'form', friend: @friend %>
+
+<%= link_to 'Show', @friend %> |
+<%= link_to 'Back', friends_path %>
diff --git a/app/views/friends/index.html.erb b/app/views/friends/index.html.erb
new file mode 100644
index 0000000..ba1020f
--- /dev/null
+++ b/app/views/friends/index.html.erb
@@ -0,0 +1,35 @@
+<p id="notice"><%= notice %></p>
+
+<h1>Friend List</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>First name</th>
+      <th>Last name</th>
+      <th>Email</th>
+      <th>Phone</th>
+      <th>Twitter</th>
+      <th colspan="3"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @friends.each do |friend| %>
+      <tr>
+        <td><%= friend.first_name %></td>
+        <td><%= friend.last_name %></td>
+        <td><%= friend.email %></td>
+        <td><%= friend.phone %></td>
+        <td><%= friend.twitter %></td>
+        <td><%= link_to 'Show', friend %></td>
+        <td><%= link_to 'Edit', edit_friend_path(friend) %></td>
+        <td><%= link_to 'Destroy', friend, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New Friend', new_friend_path %>
diff --git a/app/views/friends/index.json.jbuilder b/app/views/friends/index.json.jbuilder
new file mode 100644
index 0000000..e5aa8a6
--- /dev/null
+++ b/app/views/friends/index.json.jbuilder
@@ -0,0 +1 @@
+json.array! @friends, partial: "friends/friend", as: :friend
diff --git a/app/views/friends/new.html.erb b/app/views/friends/new.html.erb
new file mode 100644
index 0000000..4d83f8d
--- /dev/null
+++ b/app/views/friends/new.html.erb
@@ -0,0 +1,5 @@
+<h1>Add New Friend</h1>
+
+<%= render 'form', friend: @friend %>
+
+<%= link_to 'Back', friends_path %>
diff --git a/app/views/friends/show.html.erb b/app/views/friends/show.html.erb
new file mode 100644
index 0000000..1a31de4
--- /dev/null
+++ b/app/views/friends/show.html.erb
@@ -0,0 +1,29 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>First name:</strong>
+  <%= @friend.first_name %>
+</p>
+
+<p>
+  <strong>Last name:</strong>
+  <%= @friend.last_name %>
+</p>
+
+<p>
+  <strong>Email:</strong>
+  <%= @friend.email %>
+</p>
+
+<p>
+  <strong>Phone:</strong>
+  <%= @friend.phone %>
+</p>
+
+<p>
+  <strong>Twitter:</strong>
+  <%= @friend.twitter %>
+</p>
+
+<%= link_to 'Edit', edit_friend_path(@friend) %> |
+<%= link_to 'Back', friends_path %>
diff --git a/app/views/friends/show.json.jbuilder b/app/views/friends/show.json.jbuilder
new file mode 100644
index 0000000..48e293d
--- /dev/null
+++ b/app/views/friends/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! "friends/friend", friend: @friend
diff --git a/app/views/home/_header.html.erb b/app/views/home/_header.html.erb
index 931489b..ccc4162 100644
--- a/app/views/home/_header.html.erb
+++ b/app/views/home/_header.html.erb
@@ -16,6 +16,18 @@
         
         </li>
 
+        <li class="nav-item">
+
+            <%= link_to "Friends", friends_path, class:"nav-link" %>
+        
+        </li>
+
+        <li class="nav-item">
+
+            <%= link_to "Add Friend", new_friend_path, class:"nav-link" %>
+        
+        </li>
+
         
       </ul>
       <form class="d-flex" role="search">
diff --git a/config/routes.rb b/config/routes.rb
index 1dc4351..1caea36 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,5 @@
 Rails.application.routes.draw do
+  resources :friends
   # get 'home/index' # mj
   get 'home/about'
   root 'home#index'
diff --git a/db/migrate/20231221174502_create_friends.rb b/db/migrate/20231221174502_create_friends.rb
new file mode 100644
index 0000000..4eef451
--- /dev/null
+++ b/db/migrate/20231221174502_create_friends.rb
@@ -0,0 +1,13 @@
+class CreateFriends < ActiveRecord::Migration[6.1]
+  def change
+    create_table :friends do |t|
+      t.string :first_name
+      t.string :last_name
+      t.string :email
+      t.string :phone
+      t.string :twitter
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 0000000..a383703
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,25 @@
+# This file is auto-generated from the current state of the database. Instead
+# 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.
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 2023_12_21_174502) do
+
+  create_table "friends", force: :cascade do |t|
+    t.string "first_name"
+    t.string "last_name"
+    t.string "email"
+    t.string "phone"
+    t.string "twitter"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+  end
+
+end
diff --git a/test/controllers/friends_controller_test.rb b/test/controllers/friends_controller_test.rb
new file mode 100644
index 0000000..7c060dc
--- /dev/null
+++ b/test/controllers/friends_controller_test.rb
@@ -0,0 +1,48 @@
+require "test_helper"
+
+class FriendsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @friend = friends(:one)
+  end
+
+  test "should get index" do
+    get friends_url
+    assert_response :success
+  end
+
+  test "should get new" do
+    get new_friend_url
+    assert_response :success
+  end
+
+  test "should create friend" do
+    assert_difference('Friend.count') do
+      post friends_url, params: { friend: { email: @friend.email, first_name: @friend.first_name, last_name: @friend.last_name, phone: @friend.phone, twitter: @friend.twitter } }
+    end
+
+    assert_redirected_to friend_url(Friend.last)
+  end
+
+  test "should show friend" do
+    get friend_url(@friend)
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get edit_friend_url(@friend)
+    assert_response :success
+  end
+
+  test "should update friend" do
+    patch friend_url(@friend), params: { friend: { email: @friend.email, first_name: @friend.first_name, last_name: @friend.last_name, phone: @friend.phone, twitter: @friend.twitter } }
+    assert_redirected_to friend_url(@friend)
+  end
+
+  test "should destroy friend" do
+    assert_difference('Friend.count', -1) do
+      delete friend_url(@friend)
+    end
+
+    assert_redirected_to friends_url
+  end
+end
diff --git a/test/fixtures/friends.yml b/test/fixtures/friends.yml
new file mode 100644
index 0000000..9b3409c
--- /dev/null
+++ b/test/fixtures/friends.yml
@@ -0,0 +1,15 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  first_name: MyString
+  last_name: MyString
+  email: MyString
+  phone: MyString
+  twitter: MyString
+
+two:
+  first_name: MyString
+  last_name: MyString
+  email: MyString
+  phone: MyString
+  twitter: MyString
diff --git a/test/models/friend_test.rb b/test/models/friend_test.rb
new file mode 100644
index 0000000..388be77
--- /dev/null
+++ b/test/models/friend_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class FriendTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/system/friends_test.rb b/test/system/friends_test.rb
new file mode 100644
index 0000000..0a2186d
--- /dev/null
+++ b/test/system/friends_test.rb
@@ -0,0 +1,51 @@
+require "application_system_test_case"
+
+class FriendsTest < ApplicationSystemTestCase
+  setup do
+    @friend = friends(:one)
+  end
+
+  test "visiting the index" do
+    visit friends_url
+    assert_selector "h1", text: "Friends"
+  end
+
+  test "creating a Friend" do
+    visit friends_url
+    click_on "New Friend"
+
+    fill_in "Email", with: @friend.email
+    fill_in "First name", with: @friend.first_name
+    fill_in "Last name", with: @friend.last_name
+    fill_in "Phone", with: @friend.phone
+    fill_in "Twitter", with: @friend.twitter
+    click_on "Create Friend"
+
+    assert_text "Friend was successfully created"
+    click_on "Back"
+  end
+
+  test "updating a Friend" do
+    visit friends_url
+    click_on "Edit", match: :first
+
+    fill_in "Email", with: @friend.email
+    fill_in "First name", with: @friend.first_name
+    fill_in "Last name", with: @friend.last_name
+    fill_in "Phone", with: @friend.phone
+    fill_in "Twitter", with: @friend.twitter
+    click_on "Update Friend"
+
+    assert_text "Friend was successfully updated"
+    click_on "Back"
+  end
+
+  test "destroying a Friend" do
+    visit friends_url
+    page.accept_confirm do
+      click_on "Destroy", match: :first
+    end
+
+    assert_text "Friend was successfully destroyed"
+  end
+end