diff --git a/Gemfile b/Gemfile
index b1a320395a..28d932d4f1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,3 +11,14 @@ end
 group :development, :test do
   gem 'rubocop', '1.20'
 end
+
+gem "sinatra", "~> 3.0"
+gem "sinatra-contrib", "~> 3.0"
+gem "webrick", "~> 1.8"
+gem "rack-test", "~> 2.1"
+
+gem "time", "~> 0.2.2"
+
+gem "pg", "~> 1.5"
+
+gem "bcrypt", "~> 3.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index 66064703c7..1c1ed05223 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,11 +3,22 @@ GEM
   specs:
     ansi (1.5.0)
     ast (2.4.2)
+    bcrypt (3.1.18)
+    date (3.3.3)
     diff-lcs (1.4.4)
     docile (1.4.0)
+    multi_json (1.15.0)
+    mustermann (3.0.0)
+      ruby2_keywords (~> 0.0.1)
     parallel (1.20.1)
     parser (3.0.2.0)
       ast (~> 2.4.1)
+    pg (1.5.3)
+    rack (2.2.7)
+    rack-protection (3.0.6)
+      rack
+    rack-test (2.1.0)
+      rack (>= 1.3)
     rainbow (3.0.0)
     regexp_parser (2.1.1)
     rexml (3.2.5)
@@ -36,6 +47,7 @@ GEM
     rubocop-ast (1.11.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -46,18 +58,40 @@ GEM
       terminal-table
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
+    sinatra (3.0.6)
+      mustermann (~> 3.0)
+      rack (~> 2.2, >= 2.2.4)
+      rack-protection (= 3.0.6)
+      tilt (~> 2.0)
+    sinatra-contrib (3.0.6)
+      multi_json
+      mustermann (~> 3.0)
+      rack-protection (= 3.0.6)
+      sinatra (= 3.0.6)
+      tilt (~> 2.0)
     terminal-table (3.0.1)
       unicode-display_width (>= 1.1.1, < 3)
+    tilt (2.1.0)
+    time (0.2.2)
+      date
     unicode-display_width (2.0.0)
+    webrick (1.8.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bcrypt (~> 3.1)
+  pg (~> 1.5)
+  rack-test (~> 2.1)
   rspec
   rubocop (= 1.20)
   simplecov
   simplecov-console
+  sinatra (~> 3.0)
+  sinatra-contrib (~> 3.0)
+  time (~> 0.2.2)
+  webrick (~> 1.8)
 
 RUBY VERSION
    ruby 3.0.2p107
diff --git a/README.md b/README.md
index 465eda879b..9ddc4f6f58 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,69 @@
-Chitter Challenge
+# Chitter Challenge
+
+![homepage](./images/homepage.png)
+
+![shoutybox when logged in](./images/shoutybox.png)
+
+![signup page](./images/sign-up.png)
+
+
+## To Run App
+```
+ git clone https://github.com/veritywong/chitter-challenge.git
+ cd chitter-challenge
+ bundle install
+ createdb chitter_test
+ psql -h 127.0.0.1 chitter_challenge < spec/tables_seeds.sql
+ rspec
+ rackup
+ http://localhost:('Port in use')/
+```
+
+## Description
+This app is the start of a Twitter clone, that allows users to post messages to a public stream. In order to post they must signup and login, however anybody can view the public stream on the 'Shouty Box'.
+
+## Approach
+This was the first web app that we created on the course, so the goal was to get a good understanding of sending HTTP requests from the frontend and how they were then run in the backend.
+
+I begun by following a design recipe to decide database structure, which in this case includes posts and users tables, which have a many to many relationship.
+From there I used TDD to create the user repository and post repository, implementing methods towards creating CRUD functionality.
+
+Next I worked between the app.rb file and HTML files, completing the features such as signup, login and posting a new peep.
+
+Passwords are encrypted using bcrypt, and sessions are used to know whether a user is logged in and to determine what they can view.
+
+## Diagrams
+This diagram shows the differente pages in the app. The user can only post or view their account when logged in.
+
+![Account Diagram](./images/diagram.png)
+
+Below is a diagram of clicking the link for the stream of posts:
+
+![Account Diagram](./images/shoutybox-diagram.png)
+
+## Technology Used
+* Ruby
+* Sinatra & ERB
+* BCrypt
+* PostgreSQL
+* HTML & CSS
+
+## Tests
+This is a screen shot of the passing tests and test coverage.
+
+![Account Diagram](./images/passing-tests.png)
+
+
+# Initial Project Information
+
+Below is the instructuctions given at the start of the project.
+
+Gems added:
+time
+sinatra sinatra-contrib webrick rack-test
+pg
+bcrypt
+
 =================
 
 * Feel free to use Google, your notes, books, etc. but work on your own
diff --git a/app.rb b/app.rb
new file mode 100644
index 0000000000..e60c13a864
--- /dev/null
+++ b/app.rb
@@ -0,0 +1,123 @@
+# file: app.rb
+require 'sinatra/base'
+require 'sinatra/reloader'
+require 'time'
+require_relative 'lib/database_connection'
+require_relative 'lib/user_repository'
+require_relative 'lib/post_repository'
+
+
+DatabaseConnection.connect
+
+class Application < Sinatra::Base
+  enable :sessions
+
+  configure :development do
+    register Sinatra::Reloader
+    also_reload 'lib/user_repository'
+    also_reload 'lib/post_repository'
+  end
+
+  get '/' do
+    return erb(:index)
+  end
+
+  get '/login' do
+    return erb(:login)
+  end
+
+  post '/login' do
+    email = params[:email]
+    password = params[:password]
+
+    repo = UserRepository.new
+    @user = repo.find_by_email(email)
+
+    # login_result = repo.sign_in(email, password)
+   
+    if repo.sign_in(email, password) == true
+      session[:user_id] = @user.id
+
+      return erb(:login_success)
+    else
+      status 400
+      return erb(:login_error)
+    end
+  end
+
+  get '/account_page' do
+    posts = PostRepository.new
+    @users = UserRepository.new
+    
+    @user = @users.find(session[:user_id])
+    @peeps = posts.all.reverse
+    
+    if session[:user_id] == nil
+      return redirect('/login')
+    else
+      return erb(:account_page)
+    end
+  end
+
+  get '/signup' do
+    return erb(:signup)
+  end
+
+  post '/signup' do
+    users = UserRepository.new
+    new_user = User.new
+    new_user.name = params[:name]
+    new_user.username = params[:username]
+    new_user.email = params[:email]
+    new_user.password = params[:password]
+
+    users.create(new_user)
+
+    if new_user.name == '' || new_user.name == '<script>' || 
+      new_user.username == '' || new_user.username == '<script>'
+      status 400
+      return erb(:signup_error)
+    else
+      return erb(:signup_confirmation)
+    end
+
+  end
+
+  get '/shoutybox' do
+    posts = PostRepository.new
+    @users = UserRepository.new
+
+    @peeps = posts.all.reverse
+
+    return erb(:shoutybox)
+  end
+
+  post '/peep' do
+    posts = PostRepository.new
+
+    new_post = Post.new
+    new_post.peep = params[:peep]
+    new_post.time = Time.now
+    new_post.user_id = session[:user_id]
+    
+    posts.create(new_post)
+
+    if new_post.peep == '' || new_post.peep == '<script>'
+      status 400
+      return erb(:peep_new)
+    else
+      posts = PostRepository.new
+      @users = UserRepository.new
+
+      @peeps = posts.all.reverse
+      return erb(:shoutybox)
+    end
+  end
+
+  get '/logout' do
+    session[:user_id] = nil
+    return erb(:index)
+  end
+
+end
+
diff --git a/config.ru b/config.ru
new file mode 100644
index 0000000000..18af4f3388
--- /dev/null
+++ b/config.ru
@@ -0,0 +1,3 @@
+# file: config.ru
+require './app'
+run Application
\ No newline at end of file
diff --git a/images/diagram.png b/images/diagram.png
new file mode 100644
index 0000000000..949b7eedc6
Binary files /dev/null and b/images/diagram.png differ
diff --git a/images/homepage.png b/images/homepage.png
new file mode 100644
index 0000000000..621adf509d
Binary files /dev/null and b/images/homepage.png differ
diff --git a/images/passing-tests.png b/images/passing-tests.png
new file mode 100644
index 0000000000..f5dbc582ad
Binary files /dev/null and b/images/passing-tests.png differ
diff --git a/images/shoutybox-diagram.png b/images/shoutybox-diagram.png
new file mode 100644
index 0000000000..9b6bce4cc3
Binary files /dev/null and b/images/shoutybox-diagram.png differ
diff --git a/images/shoutybox.png b/images/shoutybox.png
new file mode 100644
index 0000000000..91af99dc1a
Binary files /dev/null and b/images/shoutybox.png differ
diff --git a/images/sign-up.png b/images/sign-up.png
new file mode 100644
index 0000000000..8110c4415d
Binary files /dev/null and b/images/sign-up.png differ
diff --git a/lib/database_connection.rb b/lib/database_connection.rb
new file mode 100644
index 0000000000..c4e405592a
--- /dev/null
+++ b/lib/database_connection.rb
@@ -0,0 +1,33 @@
+# file: lib/database_connection.rb
+
+require 'pg'
+
+# This class is a thin "wrapper" around the
+# PG library. We'll use it in our project to interact
+# with the database using SQL.
+
+class DatabaseConnection
+  # This method connects to PostgreSQL using the 
+  # PG gem. We connect to 127.0.0.1, and select
+  # the database name given in argument.
+  def self.connect
+    if ENV['ENV'] == 'test'
+      database_name = 'chitter_challenge_test'
+    else
+      database_name = 'chitter_challenge'
+    end
+    @connection = PG.connect({ host: '127.0.0.1', dbname: database_name })
+  end
+
+  # This method executes an SQL query 
+  # on the database, providing some optional parameters
+  # (you will learn a bit later about when to provide these parameters).
+  def self.exec_params(query, params)
+    if @connection.nil?
+      raise 'DatabaseConnection.exec_params: Cannot run a SQL query as the connection to'\
+      'the database was never opened. Did you make sure to call first the method '\
+      '`DatabaseConnection.connect` in your app.rb file (or in your tests spec_helper.rb)?'
+    end
+    @connection.exec_params(query, params)
+  end
+end
diff --git a/lib/post.rb b/lib/post.rb
new file mode 100644
index 0000000000..e2f3b27cd2
--- /dev/null
+++ b/lib/post.rb
@@ -0,0 +1,3 @@
+class Post
+    attr_accessor :id, :peep, :time, :user_id
+end
\ No newline at end of file
diff --git a/lib/post_repository.rb b/lib/post_repository.rb
new file mode 100644
index 0000000000..ae7b9eb086
--- /dev/null
+++ b/lib/post_repository.rb
@@ -0,0 +1,64 @@
+require_relative './post'
+require_relative './user_repository'
+
+class PostRepository
+
+    def all
+        posts = []
+
+        sql = 'SELECT posts.id,
+                posts.peep,
+                posts.time,
+                users.id AS user_id,
+                users.name,
+                users.username
+                FROM posts
+                JOIN users
+                ON users.id = posts.user_id;'
+
+                # 'SELECT id, peep, time, user_id FROM posts
+                # JOIN users on posts.user_id = users.id
+                # WHERE users.id = $1;'
+
+        result_set = DatabaseConnection.exec_params(sql, [])
+
+        result_set.each do |record|
+          post = Post.new
+          post.id = record['id']
+          post.peep = record['peep']
+          post.time = record['time']
+          post.user_id = record['user_id']
+        
+          posts << post
+        end
+    
+        posts
+    end
+
+
+    def create(post)
+        sql = 'INSERT INTO posts (peep, time, user_id) VALUES ($1, $2, $3);'
+        result_set = DatabaseConnection.exec_params(sql, [post.peep, post.time, post.user_id])
+    
+        return post
+    end
+
+    def find(id)
+      sql = 'SELECT id, peep, time, user_id FROM posts WHERE id = $1;'
+      sql_params = [id]
+      result = DatabaseConnection.exec_params(sql, sql_params)
+      record = result[0]
+      
+      post = Post.new
+      post.id = record['id']
+      post.peep = record['peep']
+      post.time = record['time']
+      post.user_id = record['user_id']
+
+      return post
+    end
+
+end
+
+# posts = PostRepository.new
+# posts.all
\ No newline at end of file
diff --git a/lib/user.rb b/lib/user.rb
new file mode 100644
index 0000000000..7fed3cbe88
--- /dev/null
+++ b/lib/user.rb
@@ -0,0 +1,22 @@
+# class User
+#     attr_accessor :id, :name, :username, :email, :password
+# end
+
+require 'bcrypt'
+
+class User
+
+  attr_accessor :id, :name, :username, :email, :password
+
+  # users.password_hash in the database is a :string
+  include BCrypt
+
+#   def password
+#     @password ||= Password.new(password_hash)
+#   end
+
+#   def password=(new_password)
+#     @password = Password.create(new_password)
+#     self.password_hash = @password
+#   end
+end
\ No newline at end of file
diff --git a/lib/user_repository.rb b/lib/user_repository.rb
new file mode 100644
index 0000000000..edf3737caa
--- /dev/null
+++ b/lib/user_repository.rb
@@ -0,0 +1,107 @@
+require_relative './user'
+require 'bcrypt'
+
+class UserRepository
+
+    def all
+        users = []
+
+        sql = 'SELECT id, name, username, email, password FROM users;'
+        result_set = DatabaseConnection.exec_params(sql, [])
+        
+        result_set.each do |record|
+          user = User.new
+          user.id = record['id']
+          user.name = record['name']
+          user.username = record['username']
+          user.email = record['email']
+          user.password = record['password']
+          
+          users << user
+        end
+    
+        return users
+    end
+
+    def create(user)
+      sql = 'INSERT INTO users (name, username, email, password) VALUES ($1, $2, $3, $4);'
+
+      encrypted_password = BCrypt::Password.create(user.password)
+
+      sql_params = [user.name, user.username, user.email, encrypted_password]
+
+      result = DatabaseConnection.exec_params(sql, sql_params)
+    
+      return nil
+    end
+
+    
+
+    def find(id)
+        sql = 'SELECT id, name, username FROM users WHERE id = $1;'
+        result = DatabaseConnection.exec_params(sql, [id])
+        record = result[0]
+
+        user = User.new
+        user.id = record['id']
+        user.name = record['name']
+        user.username = record['username']
+
+        return user
+    end
+
+    def find_with_peeps(id)
+      sql = 'SELECT posts.id, posts.peep, posts.time
+              FROM posts
+              JOIN users ON posts.user_id = users.id
+              WHERE users.id = $1;'
+      
+      result = DatabaseConnection.exec_params(sql, [id])
+    end
+
+    def sign_in(email, submitted_password)
+      user = find_by_email(email)
+
+      return nil if user.nil?
+
+      encrypted_password = BCrypt::Password.new(user.password)
+      password = user.password
+
+      if encrypted_password == submitted_password
+        return true
+      # elsif password == submitted_password
+      #   return true
+      else
+        return false
+      end
+    end
+
+    def find_by_email(email)
+      sql = 'SELECT id, name, username, email, password 
+            FROM users 
+            WHERE users.email = $1;'
+      
+      sql_params = [email]
+
+      result = DatabaseConnection.exec_params(sql, sql_params)
+
+      if !result.ntuples.zero?
+        record = result[0]
+        return create_user_object(record)
+      else
+          return nil
+      end
+     
+    end
+
+    def create_user_object(record)
+      user = User.new
+      user.id = record['id']
+      user.name = record['name']
+      user.username = record['username']
+      user.email = record['email']
+      user.password = record['password']
+
+      return user
+    end
+end 
diff --git a/public/styles.css b/public/styles.css
new file mode 100644
index 0000000000..6fcc967f30
--- /dev/null
+++ b/public/styles.css
@@ -0,0 +1,168 @@
+/* styles.css */
+
+html {
+    box-sizing: border-box;
+  }
+  *,
+  *::before,
+  *::after {
+    box-sizing: inherit;
+  }
+  /* generic styles for the page */
+  body {
+    padding: 0;
+    margin: 0;
+    font-family: 'Courier New', Courier, monospace;
+    background-image: url('./yada.jpg');
+    
+  }
+
+
+h1,
+h2,
+h3 {
+    margin: 0;
+    color: blue;
+    font-family: 'Courier New', Courier, monospace;
+}
+
+p {
+    color: #404042;
+    opacity: .7;
+}
+
+nav {
+    margin: 2rem;
+}
+nav ul {
+    text-decoration: none;
+    list-style-type: none;
+    display: flex;
+    gap: 3rem;
+    /* justify-content: center; */
+    margin-top: 3rem;
+}
+
+nav a {
+    text-decoration: none;
+    background-color: blue;
+    padding: 1rem;
+    border-radius: 5px;
+    color: white;
+    font-family: 'Courier New', Courier, monospace;
+}
+
+.shoutybox-button {
+    float: right;
+    margin-right: 2rem;
+    text-align: center;
+    padding: 70px 0;
+    font-size: 2rem;
+    background-color: yellow;
+    border-radius: 200px;
+    width: 200px;
+    height: 200px;
+}
+
+.shoutybox-button span {
+    display: block;
+    font-size: small;
+}
+.shoutybox-button a {
+    text-decoration: none;
+    vertical-align: middle;
+    
+}
+
+
+.banner {
+    text-align: center;
+    margin: 5rem 3rem;
+    /* margin: 0 auto; */
+    padding: 3rem;
+    font-size: 2rem;
+    background-color:green;
+    border-radius: 30px;
+}
+
+.peep {
+    border-radius: 5px;
+    background-color: lightskyblue;
+    max-width: 500px;
+    margin: 4rem auto;
+    color: blue;
+    flex-flow: row wrap;
+    padding: 2rem;
+    line-height: 2rem;
+}
+
+.login {
+    display: flex;
+    justify-content: center;
+    margin: 5rem;
+    display: block;
+    
+}
+
+.form-container h1 {
+    color: blue;
+    padding-bottom: 2rem;
+    text-align: center;
+}
+
+#shoutybox-page {
+    max-width: 600px;
+}
+
+.login label {
+    display: block;
+}
+
+.form-container {
+    background-color: lightcyan;
+    border-radius: 5px;
+    padding: 3rem;
+    max-width: 400px;
+    margin: 3px auto;
+    border-radius: 10px;
+}
+
+form {
+    justify-content: center;
+    font-weight: bold;
+}
+
+input {
+    margin: 5px;
+    width: 100%;
+}
+
+input[type=submit] {
+    display: block;
+    background-color: orange;
+    color: blue;
+    font-family: 'Courier New', Courier, monospace;
+    box-sizing: border-box;
+    border: none;
+    border-radius: 4px;
+    float: right;
+    width: auto;
+    font-size: 1.5rem;
+  }
+
+input[type=submit]:hover {
+    background-color: yellow;
+  
+}
+
+.welcome h1 {
+    background-color: lightcoral;
+    padding: 2rem;
+    border-radius: 5px;
+    max-width: 500px;
+    margin: 5rem;
+}
+
+#new-peep{
+    margin: 1rem;
+}
diff --git a/public/yada.jpg b/public/yada.jpg
new file mode 100644
index 0000000000..03d8b092fa
Binary files /dev/null and b/public/yada.jpg differ
diff --git a/recipes/many_to_many.md b/recipes/many_to_many.md
new file mode 100644
index 0000000000..d2e3b34441
--- /dev/null
+++ b/recipes/many_to_many.md
@@ -0,0 +1,182 @@
+# Two Tables (Many-to-Many) Design Recipe Template
+
+_Copy this recipe template to design and create two related database tables having a Many-to-Many relationship._
+
+## 1. Extract nouns from the user stories or specification
+
+```
+As a Maker
+So that I can let people know what I am doing  
+I want to post a message (peep) to chitter
+
+As a maker
+So that I can see what others are saying  
+I want to see all peeps in reverse chronological order
+
+As a Maker
+So that I can better appreciate the context of a peep
+I want to see the time at which it was made
+
+As a Maker
+So that I can post messages on Chitter as me
+I want to sign up for Chitter
+
+HARDER
+
+As a Maker
+So that only I can post messages on Chitter as me
+I want to log in to Chitter
+
+As a Maker
+So that I can avoid others posting messages on Chitter as me
+I want to log out of Chitter
+
+ADVANCED
+
+As a Maker
+So that I can stay constantly tapped in to the shouty box of Chitter
+I want to receive an email if I am tagged in a Peep
+```
+```
+
+```
+Nouns:
+post, message (peep), time, user, user_name, tags
+
+methods - 
+posts: see all messages (most recent first)
+user: sign-up, log-in, log-out,
+```
+
+## 2. Infer the Table Name and Columns
+
+Put the different nouns in this table. Replace the example with your own nouns.
+
+| Record                | Properties          |
+| --------------------- | ------------------  |
+| users                 | name, username, email, password
+| posts                 | peep, time
+| replies               | comment, time
+| tags                  | name
+
+1. Name of the first table (always plural): `users` 
+
+    Column names: `name`, `username`, `email`, `password`
+
+2. Name of the second table (always plural): `posts` 
+
+    Column names: `message`, `time`
+
+3. Name of the third table (always plural): `comments` 
+
+Column names: `message`, `time`, `tag??`
+
+## 3. Decide the column types.
+
+[Here's a full documentation of PostgreSQL data types](https://www.postgresql.org/docs/current/datatype.html).
+
+Most of the time, you'll need either `text`, `int`, `bigint`, `numeric`, or `boolean`. If you're in doubt, do some research or ask your peers.
+
+Remember to **always** have the primary key `id` as a first column. Its type will always be `SERIAL`.
+
+```
+# EXAMPLE:
+
+Table: users
+id: SERIAL
+name: text
+username: text
+email: text
+password: varchar?
+
+Table: posts
+id: SERIAL
+peep: text
+time: date
+
+Table: replies
+id: SERIAL
+comment: text
+time:date
+
+Table: tags
+name: text
+```
+
+## 4. Design the Many-to-Many relationship
+
+Make sure you can answer YES to these two questions:
+
+1. Can one [TABLE ONE] have many [TABLE TWO]? (Yes/No)
+2. Can one [TABLE TWO] have many [TABLE ONE]? (Yes/No)
+
+```
+# EXAMPLE
+
+1. Can one tag have many posts? YES
+2. Can one post have many tags? YES
+```
+
+_If you would answer "No" to one of these questions, you'll probably have to implement a One-to-Many relationship, which is simpler. Use the relevant design recipe in that case._
+
+## 5. Design the Join Table
+
+The join table usually contains two columns, which are two foreign keys, each one linking to a record in the two other tables.
+
+The naming convention is `table1_table2`.
+
+```
+# EXAMPLE
+
+Join table for tables: posts and tags
+Join table name: posts_tags
+Columns: post_id, tag_id
+```
+
+## 4. Write the SQL.
+
+```sql
+-- EXAMPLE
+-- file: posts_tags.sql
+
+-- Replace the table name, columm names and types.
+
+-- Create the first table.
+CREATE TABLE posts (
+  id SERIAL PRIMARY KEY,
+  title text,
+  content text
+);
+
+-- Create the second table.
+CREATE TABLE tags (
+  id SERIAL PRIMARY KEY,
+  name text
+);
+
+-- Create the join table.
+CREATE TABLE posts_tags (
+  post_id int,
+  tag_id int,
+  constraint fk_post foreign key(post_id) references posts(id) on delete cascade,
+  constraint fk_tag foreign key(tag_id) references tags(id) on delete cascade,
+  PRIMARY KEY (post_id, tag_id)
+);
+
+```
+
+## 5. Create the tables.
+
+```bash
+psql -h 127.0.0.1 database_name < posts_tags.sql
+```
+
+<!-- BEGIN GENERATED SECTION DO NOT EDIT -->
+
+---
+
+**How was this resource?**  
+[😫](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Ftwo_tables_many_to_many_design_recipe_template.md&prefill_Sentiment=😫) [😕](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Ftwo_tables_many_to_many_design_recipe_template.md&prefill_Sentiment=😕) [😐](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Ftwo_tables_many_to_many_design_recipe_template.md&prefill_Sentiment=😐) [🙂](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Ftwo_tables_many_to_many_design_recipe_template.md&prefill_Sentiment=🙂) [😀](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Ftwo_tables_many_to_many_design_recipe_template.md&prefill_Sentiment=😀)  
+Click an emoji to tell us.
+
+<!-- END GENERATED SECTION DO NOT EDIT -->
\ No newline at end of file
diff --git a/recipes/posts_comments_table_design.md b/recipes/posts_comments_table_design.md
new file mode 100644
index 0000000000..ecf8afb0ef
--- /dev/null
+++ b/recipes/posts_comments_table_design.md
@@ -0,0 +1,163 @@
+# Chitter - Two Tables Design Recipe Template
+
+_Copy this recipe template to design and create two related database tables from a specification._
+
+## 1. Extract nouns from the user stories or specification
+
+```
+STRAIGHT UP
+
+As a Maker
+So that I can let people know what I am doing  
+I want to post a message (peep) to chitter
+
+As a maker
+So that I can see what others are saying  
+I want to see all peeps in reverse chronological order
+
+As a Maker
+So that I can better appreciate the context of a peep
+I want to see the time at which it was made
+
+As a Maker
+So that I can post messages on Chitter as me
+I want to sign up for Chitter
+
+HARDER
+
+As a Maker
+So that only I can post messages on Chitter as me
+I want to log in to Chitter
+
+As a Maker
+So that I can avoid others posting messages on Chitter as me
+I want to log out of Chitter
+
+ADVANCED
+
+As a Maker
+So that I can stay constantly tapped in to the shouty box of Chitter
+I want to receive an email if I am tagged in a Peep
+```
+
+```
+Nouns:
+
+post, message (peep), time, user, user_name, (tags - in many to many recipe)
+
+```
+
+## 2. Infer the Table Name and Columns
+
+Put the different nouns in this table. Replace the example with your own nouns.
+
+| Record                | Properties          |
+| --------------------- | ------------------  |
+| users                 | name, username, email, password
+| posts                 | message (peep), time, tags
+| comments              | coment, time
+
+1. Name of the first table (always plural): `posts` 
+
+    Column names: `peep`, `time`
+
+2. Name of the second table (always plural): `comments` 
+
+    Column names: `comment`, `time`
+
+## 3. Decide the column types.
+
+[Here's a full documentation of PostgreSQL data types](https://www.postgresql.org/docs/current/datatype.html).
+
+Most of the time, you'll need either `text`, `int`, `bigint`, `numeric`, or `boolean`. If you're in doubt, do some research or ask your peers.
+
+Remember to **always** have the primary key `id` as a first column. Its type will always be `SERIAL`.
+
+```
+Table: posts
+id: SERIAL
+peep: text
+time: timestamp
+
+Table: comments
+id: SERIAL
+comment: text
+time: timestamp
+```
+
+## 4. Decide on The Tables Relationship
+
+Most of the time, you'll be using a **one-to-many** relationship, and will need a **foreign key** on one of the two tables.
+
+To decide on which one, answer these two questions:
+
+1. Can one [TABLE ONE] have many [TABLE TWO]? (Yes/No)
+2. Can one [TABLE TWO] have many [TABLE ONE]? (Yes/No)
+
+You'll then be able to say that:
+
+1. **[A] has many [B]**
+2. And on the other side, **[B] belongs to [A]**
+3. In that case, the foreign key is in the table [B]
+
+Replace the relevant bits in this example with your own:
+
+```
+# EXAMPLE
+
+1. Can one post have many comments? YES
+2. Can one comment have many posts? NO
+
+-> Therefore,
+-> An post HAS MANY comments
+-> An comment BELONGS TO an post
+
+-> Therefore, the foreign key is on the comment table.
+```
+
+*If you can answer YES to the two questions, you'll probably have to implement a Many-to-Many relationship, which is more complex and needs a third table (called a join table).*
+
+## 4. Write the SQL.
+
+```sql
+-- file: seeds.sql
+
+CREATE TABLE posts (
+  id SERIAL PRIMARY KEY,
+  peep text,
+  time timestamp,
+  user_id int,
+  constraint fk_user foreign key(user_id)
+    references users(id)
+    on delete cascade
+);
+
+DROP TABLE IF EXISTS comments CASCADE;
+
+CREATE TABLE comments (
+    id SERIAL PRIMARY KEY,
+    comment text,
+    time timestamp,
+    post_id int,
+    constraint fk_post foreign key(post_id)
+        references posts(id)
+        on delete cascade
+);
+
+```
+
+## 5. Create the tables.
+
+```bash
+psql -h 127.0.0.1 database_name < seeds.sql
+```
+
+<!-- BEGIN GENERATED SECTION DO NOT EDIT -->
+
+---
+
+**How was this resource?**  
+[😫](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Ftwo_table_design_recipe_template.md&prefill_Sentiment=😫) [😕](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Ftwo_table_design_recipe_template.md&prefill_Sentiment=😕) [😐](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Ftwo_table_design_recipe_template.md&prefill_Sentiment=😐) [🙂](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Ftwo_table_design_recipe_template.md&prefill_Sentiment=🙂) [😀](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Ftwo_table_design_recipe_template.md&prefill_Sentiment=😀)  
+Click an emoji to tell us.
+
+<!-- END GENERATED SECTION DO NOT EDIT -->
\ No newline at end of file
diff --git a/recipes/repository_design.md b/recipes/repository_design.md
new file mode 100644
index 0000000000..35cc3975ab
--- /dev/null
+++ b/recipes/repository_design.md
@@ -0,0 +1,263 @@
+# Users Model and Repository Classes Design Recipe
+
+_Copy this recipe template to design and implement Model and Repository classes for a database table._
+
+## 1. Design and create the Table
+
+If the table is already created in the database, you can skip this step.
+
+Otherwise, [follow this recipe to design and create the SQL schema for your table](./single_table_design_recipe_template.md).
+
+*In this template, we'll use an example table `students`*
+
+```
+# EXAMPLE
+
+Table: users
+
+Columns:
+id | name | username | email| password
+```
+
+## 2. Create Test SQL seeds
+
+Your tests will depend on data stored in PostgreSQL to run.
+
+If seed data is provided (or you already created it), you can skip this step.
+
+```sql
+-- EXAMPLE
+-- (file: spec/seeds_{table_name}.sql)
+
+-- Write your SQL seed here. 
+
+-- First, you'd need to truncate the table - this is so our table is emptied between each test run,
+-- so we can start with a fresh state.
+-- (RESTART IDENTITY resets the primary key)
+
+TRUNCATE TABLE users RESTART IDENTITY CASCADE;
+
+-- Below this line there should only be `INSERT` statements.
+-- Replace these statements with your own seed data.
+
+INSERT INTO users (name, username, email, password) VALUES
+('John Smith', 'JS', 'js@gmail.com', 'passwordJS'),
+('Nikki Wong', 'NickNack', 'nicknack@gmail.com', 'password2'),
+('Liam Banks', 'Liam', 'liambanks@gmail.com', 'password3');
+```
+
+Run this SQL file on the database to truncate (empty) the table, and insert the seed data. Be mindful of the fact any existing records in the table will be deleted.
+
+```bash
+psql -h 127.0.0.1 your_database_name < seeds_recipes.sql
+```
+
+## 3. Define the class names
+
+Usually, the Model class name will be the capitalised table name (single instead of plural). The same name is then suffixed by `Repository` for the Repository class name.
+
+```ruby
+# EXAMPLE
+# Table name: users
+
+# Model class
+# (in lib/user.rb)
+class User
+end
+
+# Repository class
+# (in lib/user_repository.rb)
+class UserRepository
+end
+```
+
+## 4. Implement the Model class
+
+Define the attributes of your Model class. You can usually map the table columns to the attributes of the class, including primary and foreign keys.
+
+```ruby
+# EXAMPLE
+# Table name: recipes
+
+# Model class
+# (in lib/recipe.rb)
+
+class Recipe
+
+  require 'bcrypt'
+
+class User
+  attr_accessor :id, :name, :username, :email, :password
+
+  # users.password_hash in the database is a :string
+  include BCrypt
+
+end
+
+# The keyword attr_accessor is a special Ruby feature
+# which allows us to set and get attributes on an object,
+# here's an example:
+#
+# recipe = Recipe.new
+# recipe.name = 'Baked Potato'
+# recipe.name
+```
+
+*You may choose to test-drive this class, but unless it contains any more logic than the example above, it is probably not needed.*
+
+## 5. Define the Repository Class interface
+
+Your Repository class will need to implement methods for each "read" or "write" operation you'd like to run against the database.
+
+Using comments, define the method signatures (arguments and return value) and what they do - write up the SQL queries that will be used by each method.
+
+```ruby
+# EXAMPLE
+# Table name: users
+
+# Repository class
+# (in lib/user_repository.rb)
+
+class UserRepository
+
+    def all
+    end
+
+    def create(user)
+
+    end
+
+    def find(id)
+    end
+
+    def find_with_peeps(id)
+    end
+
+    def login(email, password)
+    end
+
+    def signup(*)
+    end
+
+    def logout
+    end
+end 
+```
+
+## 6. Write Test Examples
+
+Write Ruby code that defines the expected behaviour of the Repository class, following your design from the table written in step 5.
+
+These examples will later be encoded as RSpec tests.
+
+```ruby
+# EXAMPLES
+
+# 1
+# Gets all users
+
+      it 'finds all users' do
+        repo = UserRepository.new
+      
+        users = repo.all
+          
+        expect(users.length).to eq(3)
+        expect(users.first.name).to eq('John Smith')
+      end 
+
+# 2
+# Get a single user
+    it 'finds user 1' do
+        repo = UserRepository.new
+
+        user = repo.find(1)
+
+        expect(user.name).to eq('John Smith')
+        expect(user.username).to eq('JS')
+      end
+
+# 3
+# Get user 1 with all their peeps
+     it 'finds user 1 with peeps' do
+        repo = UserRepository.new
+        user_with_peeps = repo.find_with_peeps(1)
+
+        peep = double :post, id: 1, peep: 'Hello World', time: '2023-01-08 10:30:00'
+
+        expect(peep.id).to eq(1)
+        expect(peep.time).to eq('2023-01-08 10:30:00')
+      end
+
+# 4
+# Creates a new user
+ it 'creates a new user' do
+        repo = UserRepository.new
+    
+        new_user = User.new
+        new_user.name = 'Penny Lane'
+        new_user.username = 'PLane'
+        new_user.email = 'pl@gmail.com'
+        new_user.password = 'password4'
+        repo.create(new_user)
+        
+        users = repo.all
+
+        expect(users.length).to eq(4)
+        expect(users.last.name).to eq('Penny Lane')
+      end
+
+# 5
+# Logs user in if their email and password are correct
+     it 'returns true if details are correct' do
+        repo = UserRepository.new
+        
+        users = repo.all
+        user = users.login('js@gmail.com', 'passwordJS')
+
+        expect(user.email).to eq true
+        expect(user.password).to eq true
+
+      end
+
+
+Encode this example as a test.
+
+## 7. Reload the SQL seeds before each test run
+
+Running the SQL code present in the seed file will empty the table and re-insert the seed data.
+
+This is so you get a fresh table contents every time you run the test suite.
+
+```ruby
+# EXAMPLE
+
+# file: spec/recipe_repository_spec.rb
+
+def reset_recipes_table
+  seed_sql = File.read('spec/seeds_recipes.sql')
+  connection = PG.connect({ host: '127.0.0.1', dbname: 'recipes_directory_test' })
+  connection.exec(seed_sql)
+end
+
+describe RecipeRepository do
+  before(:each) do 
+    reset_recipes_table
+  end
+
+  # (your tests will go here).
+end
+```
+
+## 8. Test-drive and implement the Repository class behaviour
+
+_After each test you write, follow the test-driving process of red, green, refactor to implement the behaviour._
+
+<!-- BEGIN GENERATED SECTION DO NOT EDIT -->
+
+---
+
+**How was this resource?**  
+[😫](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Frepository_class_recipe_template.md&prefill_Sentiment=😫) [😕](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Frepository_class_recipe_template.md&prefill_Sentiment=😕) [😐](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Frepository_class_recipe_template.md&prefill_Sentiment=😐) [🙂](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Frepository_class_recipe_template.md&prefill_Sentiment=🙂) [😀](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Frepository_class_recipe_template.md&prefill_Sentiment=😀)  
+Click an emoji to tell us.
+
+<!-- END GENERATED SECTION DO NOT EDIT -->
\ No newline at end of file
diff --git a/recipes/route_design.md b/recipes/route_design.md
new file mode 100644
index 0000000000..84c0c772bb
--- /dev/null
+++ b/recipes/route_design.md
@@ -0,0 +1,117 @@
+# {{ METHOD }} {{ PATH}} Route Design Recipe
+
+_Copy this design recipe template to test-drive a Sinatra route._
+
+## 1. Design the Route Signature
+
+You'll need to include:
+  * the HTTP method
+  * the path
+  * any query parameters (passed in the URL)
+  * or body parameters (passed in the request body)
+
+## 2. Design the Response
+
+The route might return different responses, depending on the result.
+
+For example, a route for a specific blog post (by its ID) might return `200 OK` if the post exists, but `404 Not Found` if the post is not found in the database.
+
+Your response might return plain text, JSON, or HTML code. 
+
+_Replace the below with your own design. Think of all the different possible responses your route will return._
+
+```html
+<!-- EXAMPLE -->
+<!-- Response when the post is found: 200 OK -->
+
+<html>
+  <head></head>
+  <body>
+    <h1>Post title</h1>
+    <div>Post content</div>
+  </body>
+</html>
+```
+
+```html
+<!-- EXAMPLE -->
+<!-- Response when the post is not found: 404 Not Found -->
+
+<html>
+  <head></head>
+  <body>
+    <h1>Sorry!</h1>
+    <div>We couldn't find this post. Have a look at the homepage?</div>
+  </body>
+</html>
+```
+
+## 3. Write Examples
+
+_Replace these with your own design._
+
+```
+# Request:
+
+GET /posts?id=1
+
+# Expected response:
+
+Response for 200 OK
+```
+
+```
+# Request:
+
+GET /posts?id=276278
+
+# Expected response:
+
+Response for 404 Not Found
+```
+
+## 4. Encode as Tests Examples
+
+```ruby
+# EXAMPLE
+# file: spec/integration/application_spec.rb
+
+require "spec_helper"
+
+describe Application do
+  include Rack::Test::Methods
+
+  let(:app) { Application.new }
+
+  context "GET /" do
+    it 'returns 200 OK' do
+      # Assuming the post with id 1 exists.
+      response = get('/posts?id=1')
+
+      expect(response.status).to eq(200)
+      # expect(response.body).to eq(expected_response)
+    end
+
+    it 'returns 404 Not Found' do
+      response = get('/posts?id=276278')
+
+      expect(response.status).to eq(404)
+      # expect(response.body).to eq(expected_response)
+    end
+  end
+end
+```
+
+## 5. Implement the Route
+
+Write the route and web server code to implement the route behaviour.
+
+<!-- BEGIN GENERATED SECTION DO NOT EDIT -->
+
+---
+
+**How was this resource?**  
+[😫](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fweb-applications&prefill_File=resources%2Fsinatra_route_design_recipe_template.md&prefill_Sentiment=😫) [😕](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fweb-applications&prefill_File=resources%2Fsinatra_route_design_recipe_template.md&prefill_Sentiment=😕) [😐](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fweb-applications&prefill_File=resources%2Fsinatra_route_design_recipe_template.md&prefill_Sentiment=😐) [🙂](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fweb-applications&prefill_File=resources%2Fsinatra_route_design_recipe_template.md&prefill_Sentiment=🙂) [😀](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fweb-applications&prefill_File=resources%2Fsinatra_route_design_recipe_template.md&prefill_Sentiment=😀)  
+Click an emoji to tell us.
+
+<!-- END GENERATED SECTION DO NOT EDIT -->
\ No newline at end of file
diff --git a/recipes/users_posts_table_design.md b/recipes/users_posts_table_design.md
new file mode 100644
index 0000000000..0fda025a73
--- /dev/null
+++ b/recipes/users_posts_table_design.md
@@ -0,0 +1,165 @@
+# Chitter - Two Tables Design Recipe Template
+
+_Copy this recipe template to design and create two related database tables from a specification._
+
+## 1. Extract nouns from the user stories or specification
+
+```
+STRAIGHT UP
+
+As a Maker
+So that I can let people know what I am doing  
+I want to post a message (peep) to chitter
+
+As a maker
+So that I can see what others are saying  
+I want to see all peeps in reverse chronological order
+
+As a Maker
+So that I can better appreciate the context of a peep
+I want to see the time at which it was made
+
+As a Maker
+So that I can post messages on Chitter as me
+I want to sign up for Chitter
+
+HARDER
+
+As a Maker
+So that only I can post messages on Chitter as me
+I want to log in to Chitter
+
+As a Maker
+So that I can avoid others posting messages on Chitter as me
+I want to log out of Chitter
+
+ADVANCED
+
+As a Maker
+So that I can stay constantly tapped in to the shouty box of Chitter
+I want to receive an email if I am tagged in a Peep
+```
+
+```
+Nouns:
+
+post, message (peep), time, user, user_name, (tags - in many to many recipe)
+
+```
+
+## 2. Infer the Table Name and Columns
+
+Put the different nouns in this table. Replace the example with your own nouns.
+
+| Record                | Properties          |
+| --------------------- | ------------------  |
+| users                 | name, username, email, password
+| posts                 | message (peep), time, tags
+|                       | 
+
+1. Name of the first table (always plural): `users` 
+
+    Column names: `name`, `username`, `email`, `password`
+
+2. Name of the second table (always plural): `posts` 
+
+    Column names: `peep`, `time`
+
+## 3. Decide the column types.
+
+[Here's a full documentation of PostgreSQL data types](https://www.postgresql.org/docs/current/datatype.html).
+
+Most of the time, you'll need either `text`, `int`, `bigint`, `numeric`, or `boolean`. If you're in doubt, do some research or ask your peers.
+
+Remember to **always** have the primary key `id` as a first column. Its type will always be `SERIAL`.
+
+```
+# EXAMPLE:
+
+Table: users
+id: SERIAL
+name: text
+username: text
+email: text
+password: varchar
+
+Table: posts
+id: SERIAL
+peep: text
+time: timestamp
+```
+
+## 4. Decide on The Tables Relationship
+
+Most of the time, you'll be using a **one-to-many** relationship, and will need a **foreign key** on one of the two tables.
+
+To decide on which one, answer these two questions:
+
+1. Can one [TABLE ONE] have many [TABLE TWO]? (Yes/No)
+2. Can one [TABLE TWO] have many [TABLE ONE]? (Yes/No)
+
+You'll then be able to say that:
+
+1. **[A] has many [B]**
+2. And on the other side, **[B] belongs to [A]**
+3. In that case, the foreign key is in the table [B]
+
+Replace the relevant bits in this example with your own:
+
+```
+# EXAMPLE
+
+1. Can one user have many posts? YES
+2. Can one post have many users? NO
+
+-> Therefore,
+-> An user HAS MANY posts
+-> An post BELONGS TO an user
+
+-> Therefore, the foreign key is on the post table.
+```
+
+*If you can answer YES to the two questions, you'll probably have to implement a Many-to-Many relationship, which is more complex and needs a third table (called a join table).*
+
+## 4. Write the SQL.
+
+```sql
+-- file: seeds.sql
+
+CREATE TABLE users (
+  id SERIAL PRIMARY KEY,
+  name text,
+  username text,
+  email text,
+  password varchar
+);
+
+DROP TABLE IF EXISTS posts CASCADE;
+-- Create the second table.
+CREATE TABLE posts (
+  id SERIAL PRIMARY KEY,
+  peep text,
+  time timestamp,
+  user_id int,
+  constraint fk_user foreign key(user_id)
+    references users(id)
+    on delete cascade
+);
+
+```
+
+## 5. Create the tables.
+
+```bash
+psql -h 127.0.0.1 database_name < seeds.sql
+```
+
+<!-- BEGIN GENERATED SECTION DO NOT EDIT -->
+
+---
+
+**How was this resource?**  
+[😫](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Ftwo_table_design_recipe_template.md&prefill_Sentiment=😫) [😕](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Ftwo_table_design_recipe_template.md&prefill_Sentiment=😕) [😐](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Ftwo_table_design_recipe_template.md&prefill_Sentiment=😐) [🙂](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Ftwo_table_design_recipe_template.md&prefill_Sentiment=🙂) [😀](https://airtable.com/shrUJ3t7KLMqVRFKR?prefill_Repository=makersacademy%2Fdatabases&prefill_File=resources%2Ftwo_table_design_recipe_template.md&prefill_Sentiment=😀)  
+Click an emoji to tell us.
+
+<!-- END GENERATED SECTION DO NOT EDIT -->
\ No newline at end of file
diff --git a/spec/app_spec.rb b/spec/app_spec.rb
new file mode 100644
index 0000000000..a267c1c3c8
--- /dev/null
+++ b/spec/app_spec.rb
@@ -0,0 +1,186 @@
+require "spec_helper"
+require "rack/test"
+require_relative '../app'
+
+RSpec.describe Application do
+  # This is so we can use rack-test helper methods.
+  include Rack::Test::Methods
+
+  # We need to declare the `app` value by instantiating the Application
+  # class so our tests work.
+  let(:app) { Application.new }
+
+  def reset_table
+    seed_sql = File.read('spec/seeds.sql')
+    connection = PG.connect({ host: '127.0.0.1', dbname: 'chitter_challenge_test' })
+    connection.exec(seed_sql)
+  end
+  
+
+  describe Application do
+    before(:each) do 
+      reset_table
+    end
+  end
+
+  context 'GET /' do
+    it 'returns html homepage' do
+        response = get('/')
+        
+        expect(response.status).to eq(200)
+        expect(response.body).to include('<a href="/login">Login</a>')
+        expect(response.body).to include('<a href="/signup">Signup</a><br>')
+        expect(response.body).to include('<h1>Welcome to Chitter</h1>')
+        expect(response.body).to include('<a href="/shoutybox">Shouty Box<br> see what people are peeping </a>')
+    end
+  end
+
+  context 'GET /login' do
+    it 'returns login page' do
+        response = get('/login')
+
+        expect(response.status).to eq(200)
+        expect(response.body).to include('<h1>Login</h1>')
+        expect(response.body).to include('<form action="/login" method="POST">')
+        expect(response.body).to include('<input type="email" name="email">')
+        expect(response.body).to include('<input type="password" name="password">')
+    end
+  end
+
+  context 'POST /login' do
+
+    it 'if login details correct it returns confirmation of login' do
+      response = post('/login', email: 'pl@gmail.com', password: 'password4')
+
+      expect(response.status).to eq(200)
+      expect(response.body).to include('<h1>Welcome back Penny Lane</h1>')
+      expect(response.body).to include('<a href="/">Homepage</a>')
+
+    end
+
+    it 'if incorrect login returns user to login error page' do
+      response = post('/login', email: '', password: '')
+
+      expect(response.status).to eq(400)
+      expect(response.body).to include('<h1>Login Error please try again</h1>')
+      expect(response.body).to include('<form action="/login" method="POST">')
+
+    end
+  end
+
+  context 'GET /account_page' do
+
+    it 'lets user make a new peep if session in progress' do
+      response = post('/login', email: 'pl@gmail.com', password: 'password4')
+      response = get('/account_page')
+     
+      expect(response.status).to eq(200)
+      expect(response.body).to include('<a href="/peep/new">New Peep</a>')
+    end
+  end
+
+  context 'GET /signup' do
+    it 'returns signup page' do
+        response = get('/signup')
+
+        expect(response.status).to eq(200)
+        expect(response.body).to include('<h1>Signup</h1>')
+        expect(response.body).to include('<input type="text" name="name">')        
+        expect(response.body).to include('<input type="text" name="username">')
+        expect(response.body).to include('<input type="email" name="email">')
+        expect(response.body).to include('<input type="password" name="password">')
+    end
+  end
+
+  context 'POST /signup' do
+    it 'creates a new user' do
+        response = post('/signup', name: 'Pippa Long', username: 'Longstockings', email: 'piplong@gmail.com', password: 'password_test')
+
+        expect(response.status).to eq(200)
+        expect(response.body).to include('<h1>You have successfully signed up with Chitter</h1>')
+        expect(response.body).to include('<h1>You have successfully signed up with Chitter</h1>')
+
+    end
+
+    it 'returns to singup page if wrong inputs' do
+      response = post('/signup', name: '', username: '', email: 'piplong@gmail.com', password: 'password_test')
+
+      expect(response.status).to eq(400)
+      expect(response.body).to include('<h1>Signup</h1>')
+      expect(response.body).to include('<input type="text" name="name">')        
+      expect(response.body).to include('<input type="text" name="username">')
+      expect(response.body).to include('<input type="text" name="email">')
+      expect(response.body).to include('<input type="text" name="password">')
+    end
+
+    it 'returns to singup page if wrong inputs' do
+      response = post('/signup', name: '<script>', username: '<script>', email: 'piplong@gmail.com', password: 'password_test')
+
+      expect(response.status).to eq(400)
+      expect(response.body).to include('<h1>Signup</h1>')
+      expect(response.body).to include('<input type="text" name="name">')        
+      expect(response.body).to include('<input type="text" name="username">')
+      expect(response.body).to include('<input type="text" name="email">')
+      expect(response.body).to include('<input type="text" name="password">')
+    end
+  end
+
+  context 'GET /shoutybox' do
+    it 'returns page with peeps in reverse chronological order' do
+        response = get('/shoutybox')
+
+        expect(response.status).to eq(200)
+        expect(response.body).to include('<h1>SHOUTYBOX</h1>')
+
+    end
+  end
+
+  context 'GET /peep/new' do
+    it 'returns form to create a new peep' do
+        response = get('/peep/new')
+        expect(response.status).to eq(200)
+        expect(response.body).to include('<h2>new peep</h2>')
+        expect(response.body).to include('<label>peep</label>')
+        expect(response.body).to include('<input type="text" name="peep">')
+    end
+  end
+
+  context 'POST /peep' do
+    it 'posts a new peep' do
+        response = post('/peep', peep: 'Hello World!', time:'2023-01-10 10:30:00', user_id: '3')
+        expect(response.status).to eq(200)
+        # expect(response.body).to include('<h1>You have successfully signed up with Chitter</h1>')
+        # expect(response.body).to include('<a href="/shoutybox">Shouty Box<br>- see what people are peeping</a>')
+
+    end
+
+    it 'returns to post peep page if input not vaild' do
+      response = post('/peep', peep:'', time:'2023-01-10 10:30:00', user_id: '3')
+
+      expect(response.status).to eq(400)
+      expect(response.body).to include('<h2>new peep</h2>')
+      expect(response.body).to include('<label>peep</label>')
+      expect(response.body).to include('<input type="text" name="peep">')
+    end
+
+    it 'returns to post peep page if input not vaild' do
+      response = post('/peep', peep:'<script>', time:'2023-01-10 10:30:00', user_id: '3')
+
+      expect(response.status).to eq(400)
+      expect(response.body).to include('<h2>new peep</h2>')
+      expect(response.body).to include('<label>peep</label>')
+      expect(response.body).to include('<input type="text" name="peep">')
+    end
+  end
+
+  context 'GET /logout' do
+    it 'logs user out by ending session' do
+      response = post('/login', email: 'pl@gmail.com', password: 'password4')
+      response = get('/logout')
+
+      expect(response.status).to eq(200)
+      expect(response.body).to include('<h1>Welcome to Chitter</h1>')
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/spec/post_repository_spec.rb b/spec/post_repository_spec.rb
new file mode 100644
index 0000000000..06fd4a677f
--- /dev/null
+++ b/spec/post_repository_spec.rb
@@ -0,0 +1,47 @@
+require 'post_repository'
+require 'post'
+
+RSpec.describe PostRepository do
+  def reset_table
+      seed_sql = File.read('spec/seeds.sql')
+      connection = PG.connect({ host: '127.0.0.1', dbname: 'chitter_challenge_test' })
+      connection.exec(seed_sql)
+  end
+      
+    describe PostRepository do
+      before(:each) do 
+        reset_table
+      end
+      
+      it 'finds all posts' do
+        repo = PostRepository.new
+      
+        posts = repo.all
+          
+        expect(posts.length).to eq(2)
+        expect(posts.first.time).to eq('2023-01-08 10:30:00')
+      end 
+
+      it 'creates a new post' do
+        repo = PostRepository.new
+
+        new_post = double :post, peep: 'Hello World', time: '2023-01-10 10:00', user_id: '3'
+        repo.create(new_post)
+        
+        posts = repo.all
+
+        expect(posts.length).to eq(3)
+        expect(posts.last.user_id).to eq('3')
+      end
+
+      it 'finds a post by specific user' do
+        repo = PostRepository.new
+
+        post = repo.find(1)
+
+        expect(post.peep).to eq('this is my first post')
+        expect(post.time).to eq('2023-01-08 10:30:00')
+      end
+    end
+
+end
\ No newline at end of file
diff --git a/spec/seeds.sql b/spec/seeds.sql
new file mode 100644
index 0000000000..5c9f561ac0
--- /dev/null
+++ b/spec/seeds.sql
@@ -0,0 +1,19 @@
+TRUNCATE TABLE users, posts, comments, tags RESTART IDENTITY CASCADE;
+
+INSERT INTO users (name, username, email, password) VALUES
+('John Smith', 'JS', 'js@gmail.com', 'passwordJS'),
+('Nikki Wong', 'NickNack', 'nicknack@gmail.com', 'password2'),
+('Liam Banks', 'Liam', 'liambanks@gmail.com', 'password3');
+
+INSERT INTO posts (peep, time, user_id) VALUES ('this is my first post', 'Jan-08-2023 10:30', 1),
+('Any film recommends?', 'Jan-09-2023 14:00', 2);
+
+INSERT INTO comments (comment, time, post_id) VALUES ('Welcome to chitter!', 'Jan-08-2023 11:00', 1),
+('yes! Everything Everywhere film!', 'Jan-09-2023 12:00', 2);
+
+INSERT INTO tags (tag, post_id, user_id) VALUES
+('NickNack', 1, 2),
+('Liam', 2, 3);
+
+ALTER TABLE tags ADD FOREIGN KEY (post_id) REFERENCES posts(id);
+ALTER TABLE tags ADD FOREIGN KEY (user_id) REFERENCES users(id);
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 252747d899..f9c50f07c8 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,5 +1,10 @@
 require 'simplecov'
 require 'simplecov-console'
+require 'database_connection'
+
+
+ENV['ENV'] = 'test'
+DatabaseConnection.connect
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
   SimpleCov::Formatter::Console,
@@ -15,3 +20,103 @@
     puts "\e[33mTry it now! Just run: rubocop\e[0m"
   end
 end
+
+
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# See https://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # 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.
+=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:
+  # https://rspec.info/features/3-12/rspec-core/configuration/zero-monkey-patching-mode/
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # 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.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # 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/tables_seeds.sql b/spec/tables_seeds.sql
new file mode 100644
index 0000000000..9144669034
--- /dev/null
+++ b/spec/tables_seeds.sql
@@ -0,0 +1,49 @@
+DROP TABLE IF EXISTS users CASCADE;
+
+CREATE TABLE users (
+  id SERIAL PRIMARY KEY,
+  name text,
+  username text,
+  email text,
+  password varchar
+);
+
+DROP TABLE IF EXISTS posts CASCADE;
+-- Create the second table.
+CREATE TABLE posts (
+  id SERIAL PRIMARY KEY,
+  peep text,
+  time timestamp,
+  user_id int,
+  constraint fk_user foreign key(user_id)
+    references users(id)
+    on delete cascade
+);
+
+DROP TABLE IF EXISTS comments CASCADE;
+
+CREATE TABLE comments (
+    id SERIAL PRIMARY KEY,
+    comment text,
+    time timestamp,
+    post_id int,
+    constraint fk_post foreign key(post_id)
+        references posts(id)
+        on delete cascade
+);
+
+
+DROP TABLE IF EXISTS tags CASCADE;
+
+CREATE TABLE tags (
+    tag text,
+    post_id int,
+    user_id int,
+    constraint fk_post foreign key(post_id)
+    references posts(id)
+    on delete cascade,
+    constraint fk_user foreign key(user_id)
+    references users(id)
+    on delete cascade,
+    PRIMARY KEY (post_id, user_id)
+);
diff --git a/spec/user_repository_spec.rb b/spec/user_repository_spec.rb
new file mode 100644
index 0000000000..b695a7948f
--- /dev/null
+++ b/spec/user_repository_spec.rb
@@ -0,0 +1,75 @@
+require 'user_repository'
+require 'user'
+
+RSpec.describe UserRepository do
+  def reset_users_table
+      seed_sql = File.read('spec/seeds.sql')
+      connection = PG.connect({ host: '127.0.0.1', dbname: 'chitter_challenge_test' })
+      connection.exec(seed_sql)
+  end
+
+  def reset_posts_table
+    seed_sql = File.read('spec/seeds.sql')
+    connection = PG.connect({ host: '127.0.0.1', dbname: 'chitter_challenge_test' })
+    connection.exec(seed_sql)
+  end
+      
+    describe UserRepository do
+      before(:each) do 
+        reset_users_table
+      end
+      
+      it 'finds all users' do
+        repo = UserRepository.new
+      
+        users = repo.all
+          
+        expect(users.length).to eq(3)
+        expect(users.first.name).to eq('John Smith')
+      end 
+
+      it 'finds user 1' do
+        repo = UserRepository.new
+
+        user = repo.find(1)
+
+        expect(user.name).to eq('John Smith')
+        expect(user.username).to eq('JS')
+      end
+
+      it 'finds user 1 with peeps' do
+        repo = UserRepository.new
+        user_with_peeps = repo.find_with_peeps(1)
+
+        peep = double :post, id: 1, peep: 'Hello World', time: '2023-01-08 10:30:00'
+
+        expect(peep.id).to eq(1)
+        expect(peep.time).to eq('2023-01-08 10:30:00')
+      end
+
+      it 'creates a new user' do
+        repo = UserRepository.new
+
+        new_user = double :user, name: 'Penny Lane', username: 'PLane', email: 'pl@gmail.com', password: 'password4'
+        repo.create(new_user)
+        
+        users = repo.all
+
+        expect(users.length).to eq(4)
+        expect(users.last.name).to eq('Penny Lane')
+      end
+
+      it 'signs in user' do
+        repo = UserRepository.new
+        new_user = double :user, name: 'Penny Lane', username: 'PLane', email: 'pl@gmail.com', password: 'password4'
+
+        repo.create(new_user)
+
+        expect(repo.sign_in('pl@gmail.com', 'password4')).to eq true
+        expect(repo.sign_in('pl@gmail.com', 'passw0rd4')).to eq false
+      end
+
+    end
+
+end
+
diff --git a/views/account_page.erb b/views/account_page.erb
new file mode 100644
index 0000000000..c0416f53b2
--- /dev/null
+++ b/views/account_page.erb
@@ -0,0 +1,14 @@
+<div class="form-container" id="shoutybox-page">
+<h1>Hi <%=@user.name%></h1>
+
+    <h2>My Peeps:</h2>
+    <% @peeps.each do |peep| %>
+        <% if peep.user_id == session[:user_id] %>
+        <div class="peep">
+        <h3><%=peep.peep%></h3><br>
+            <%=@users.find(peep.user_id).name%> - <%=@users.find(peep.user_id).username%> -
+            <%=peep.time%>
+        <% end %>    
+        </div>
+    <% end %>
+</div>
\ No newline at end of file
diff --git a/views/index.erb b/views/index.erb
new file mode 100644
index 0000000000..a24365e7e5
--- /dev/null
+++ b/views/index.erb
@@ -0,0 +1,13 @@
+<head>
+  <meta charset="UTF-8">
+  <title>CHITTER</title>
+</head>
+
+<body>
+  <div class="banner">
+
+    <h1>Welcome to Chitter</h1>
+
+  </div>
+</body>
+
diff --git a/views/layout.erb b/views/layout.erb
new file mode 100644
index 0000000000..34b4f3b191
--- /dev/null
+++ b/views/layout.erb
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <!-- Change these Google fonts with your own choice -->
+    <link href="https://fonts.googleapis.com/css2?family=Space+Mono&display=swap" rel="stylesheet">
+    <link rel="stylesheet" href="styles.css">
+    <title>CHITTER</title>
+  </head>
+
+  <body>
+  <div class="background">
+     <nav>
+     <ul> 
+        <li><a href="/">Homepage</a></li>
+        <li><a href="/shoutybox">Shouty Box</a></li>
+        <% if session[:user_id] == nil %>
+        <li><a href="/signup">Signup</a><br></li>
+        <li><a href="/login">Login</a></li>
+        <% else %>
+        <li><a href="/account_page">My Account</a><br></li>
+        <li><a href="/shoutybox">New Peep</a></li>
+        <li><a href="/logout">Logout</a></li>
+    </ul>
+        
+        <%end%>
+    </nav>
+
+    <div class="shoutybox-button">
+    <a href="/shoutybox">Shouty Box <span class="byline"> see what people are peeping</span> </a>
+    </div>
+
+    <main><%= yield %></main>
+
+    
+  </div>
+  </body>
+</html>
diff --git a/views/login.erb b/views/login.erb
new file mode 100644
index 0000000000..1b0ef775c8
--- /dev/null
+++ b/views/login.erb
@@ -0,0 +1,15 @@
+<body>
+<div class="login">
+<div class="form-container">
+<h1>Login</h1>
+        <form action="/login" method="POST">
+            <label>email</label>
+            <input type="email" name="email">
+            <label>password</label>
+            <input type="password" name="password">
+            
+            <input type="submit" value="Login">
+        </form>
+    </div>
+</div>
+</body>
\ No newline at end of file
diff --git a/views/login_error.erb b/views/login_error.erb
new file mode 100644
index 0000000000..dd49bfc9e5
--- /dev/null
+++ b/views/login_error.erb
@@ -0,0 +1,12 @@
+<div class="form-container">
+    <h1>Login</h1>
+    <p>Error - please try again</p>
+        <form action="/login" method="POST">
+            <label>email</label>
+            <input type="text" name="email">
+            <label>password</label>
+            <input type="text" name="password">
+            
+            <input type="submit" value="Login">
+        </form>
+        </div>
diff --git a/views/login_success.erb b/views/login_success.erb
new file mode 100644
index 0000000000..3f6f0e6ff6
--- /dev/null
+++ b/views/login_success.erb
@@ -0,0 +1,3 @@
+<div class="welcome">
+<h1>Welcome back <%=@user.name%></h1>
+</div>
\ No newline at end of file
diff --git a/views/shoutybox.erb b/views/shoutybox.erb
new file mode 100644
index 0000000000..f99c9eca6f
--- /dev/null
+++ b/views/shoutybox.erb
@@ -0,0 +1,21 @@
+<div class="form-container" id="shoutybox-page">
+<h1>SHOUTYBOX</h1>
+<% if session[:user_id] != nil %>
+<div id="new-peep">
+<h2>new peep</h2>
+<form id="new-peep" action="/peep" method="POST">
+    <input type="text" name="peep">
+
+    <input type="submit" value="post">
+</form>
+</div>
+<% end %>
+  <% @peeps.each do |peep| %>
+    <div class="peep">
+    <h3><%=peep.peep%></h3><br>
+    <%=@users.find(peep.user_id).name%> - <%=@users.find(peep.user_id).username%> -
+    <%=peep.time%>
+    </div>
+<% end %>
+</div>
+
diff --git a/views/signup.erb b/views/signup.erb
new file mode 100644
index 0000000000..f692b59fff
--- /dev/null
+++ b/views/signup.erb
@@ -0,0 +1,18 @@
+<body>
+
+<div class="form-container">
+<h1>Signup</h1>
+    <form action="/signup" method="POST">
+        <label>name</label>
+        <input type="text" name="name">
+        <label>username</label>
+        <input type="text" name="username">
+        <label>email</label>
+        <input type="email" name="email">
+        <label>password</label>
+        <input type="password" name="password">
+        
+        <input type="submit" value="Signup">
+    </form>
+    </div>
+</body>
diff --git a/views/signup_confirmation.erb b/views/signup_confirmation.erb
new file mode 100644
index 0000000000..e1d2d50cf2
--- /dev/null
+++ b/views/signup_confirmation.erb
@@ -0,0 +1,2 @@
+<h1>You have successfully signed up with Chitter</h1>
+
diff --git a/views/signup_error.erb b/views/signup_error.erb
new file mode 100644
index 0000000000..ad55d3f0a7
--- /dev/null
+++ b/views/signup_error.erb
@@ -0,0 +1,19 @@
+
+<body>
+<div class="form-container">
+<h1>Signup</h1>
+<p>Error - please try again</p>
+    <form action="/signup" method="POST">
+        <label>name</label>
+        <input type="text" name="name">
+        <label>username</label>
+        <input type="text" name="username">
+        <label>email</label>
+        <input type="text" name="email">
+        <label>password</label>
+        <input type="text" name="password">
+        
+        <input type="submit" value="Signup">
+    </form>
+</div>
+</body>