diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..7e41c831e
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,4 @@
+FROM eclipse-temurin:17-jdk-alpine
+VOLUME /tmp
+COPY target/*.jar app.jar
+ENTRYPOINT ["java","-jar","/app.jar"]
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index dc2e28b62..14c16b82f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-	    <version>1.18.24</version>
+	    <version>1.18.30</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -104,6 +104,11 @@
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>font-awesome</artifactId>
+            <version>4.7.0</version>
+        </dependency>
     </dependencies>
 
 
diff --git a/src/main/java/com/makersacademy/acebook/SecurityConfiguration.java b/src/main/java/com/makersacademy/acebook/SecurityConfiguration.java
index a6829646e..c3df96c5a 100644
--- a/src/main/java/com/makersacademy/acebook/SecurityConfiguration.java
+++ b/src/main/java/com/makersacademy/acebook/SecurityConfiguration.java
@@ -28,11 +28,11 @@ protected void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests()
                 .antMatchers("/posts").hasRole("USER")
                 .antMatchers("/users").permitAll()
-                .and().formLogin();
+                .and().formLogin().loginPage("/login");
     }
 
     @Bean
     public PasswordEncoder getPasswordEncoder() {
         return NoOpPasswordEncoder.getInstance();
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/makersacademy/acebook/controller/CommentController.java b/src/main/java/com/makersacademy/acebook/controller/CommentController.java
new file mode 100644
index 000000000..6d60ed92b
--- /dev/null
+++ b/src/main/java/com/makersacademy/acebook/controller/CommentController.java
@@ -0,0 +1,93 @@
+package com.makersacademy.acebook.controller;
+
+import com.makersacademy.acebook.model.Comment;
+import com.makersacademy.acebook.model.Post;
+import com.makersacademy.acebook.model.User;
+import com.makersacademy.acebook.repository.CommentRepository;
+import com.makersacademy.acebook.repository.PostRepository;
+import com.makersacademy.acebook.repository.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import java.security.Principal;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Optional;
+
+@Controller
+public class CommentController {
+
+
+    @Autowired
+    PostRepository postRepository;
+
+    @Autowired
+    CommentRepository commentRepository;
+
+    @Autowired
+    UserRepository userRepository;
+
+    @GetMapping("/post/{id}")
+    public String show(@PathVariable Long id, Model model, Principal principal) {
+
+//        get post to display at the top of page
+        Optional<Post> post = postRepository.findById(id);
+        Post currentPost = post.orElse(null);
+        model.addAttribute("currentPost", currentPost);
+
+        Optional<User> postUser = userRepository.findById(currentPost.getUserId());
+        User postOwner = postUser.orElse(null);
+        model.addAttribute("postOwner", postOwner);
+
+
+//        create new comment object to make a new comment using the form
+        Comment commentObj = new Comment();
+        model.addAttribute("newComment", commentObj);
+
+//          Create a LinkedHashMap to store sorted data
+        LinkedHashMap<Comment, User> commentsAndOwners = new LinkedHashMap<>();
+
+//        get an ordered list of comments associated with the post we are visiting
+        List<Comment> comments = commentRepository.findAllByPostIdOrderById(id);
+        model.addAttribute("comments", comments);
+
+        //profile image for user
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+        assert principalUser != null;
+
+
+//        for each comment, find the associated user/owner and add both to LinkedHaspMap
+        for (Comment comment : comments) {
+            Optional<User> commentOwner = userRepository.findById(comment.getUserId());
+            User user = commentOwner.orElse(null);
+            commentsAndOwners.put(comment, user);
+        }
+//        System.out.println(commentsAndOwners);
+        model.addAttribute("commentsAndOwners", commentsAndOwners);
+        model.addAttribute("principalUser", principalUser);
+
+
+//        commentsAndOwners = { comment : owner , comment : owner , comment : owner , comment : owner }
+
+        return "posts/show";
+    }
+
+    @PostMapping("/post/addComment")
+    public String createComment(@RequestParam String comment, @RequestParam Long postId, Principal principal) {
+
+//        Get userID
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+
+        Comment newComment = new Comment(comment, postId, principalUser.getId());
+
+        commentRepository.save(newComment);
+
+        return "redirect:/post/" + postId;
+
+    }
+}
diff --git a/src/main/java/com/makersacademy/acebook/controller/FriendController.java b/src/main/java/com/makersacademy/acebook/controller/FriendController.java
new file mode 100644
index 000000000..9f32ae045
--- /dev/null
+++ b/src/main/java/com/makersacademy/acebook/controller/FriendController.java
@@ -0,0 +1,97 @@
+package com.makersacademy.acebook.controller;
+
+import com.makersacademy.acebook.model.Friend;
+import com.makersacademy.acebook.model.User;
+import com.makersacademy.acebook.repository.FriendRepository;
+import com.makersacademy.acebook.repository.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.view.RedirectView;
+
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+@Controller
+public class FriendController {
+
+    @Autowired
+    FriendRepository friendRepository;
+    @Autowired
+    UserRepository userRepository;
+
+    @GetMapping("/users/friend")
+    public ModelAndView showFriends(Model model) {
+        ModelAndView modelAndView = new ModelAndView("/users/friend");
+        modelAndView.addObject("friend", new Friend());
+        return modelAndView;
+    }
+
+    @GetMapping("/friends")
+    public ModelAndView showRequests(Principal principal, Model model) {
+        ModelAndView modelAndView = new ModelAndView("/users/friends");
+
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+
+        assert principalUser != null;
+        List<Friend> pendingRequests = friendRepository.findByStatusAndReceiverId(principalUser.getId(), "PENDING");
+        List<Friend> acceptedRequests = friendRepository.findByStatusAndReceiverId(principalUser.getId(), "ACCEPTED");
+
+        ArrayList<User> friendRequests = new ArrayList<>();
+        for (Friend friend : pendingRequests) {
+            Optional<User> optionalUser = userRepository.findById(friend.getRequesterId());
+            User friendRequest = optionalUser.orElse(null);
+            friendRequests.add(friendRequest);
+        }
+
+        ArrayList<User> friends = new ArrayList<>();
+        for (Friend friend : acceptedRequests) {
+            Optional<User> optionalUser = userRepository.findById(friend.getRequesterId());
+            User acceptedRequest = optionalUser.orElse(null);
+            friends.add(acceptedRequest);
+        }
+
+
+
+        modelAndView.addObject("friendRequests", friendRequests);
+        modelAndView.addObject("friends", friends);
+        modelAndView.addObject("currentUser", principalUser);
+        modelAndView.addObject("profilePicture", principalUser.getImageUrl());
+        return modelAndView;
+    }
+
+    @PostMapping("/handleFriendRequest")
+    public RedirectView handleFriendRequest(@RequestParam("requester_id") Long requesterId,
+                                            @RequestParam("receiver_id") Long receiverId, Principal principal) {
+
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+        assert principalUser != null;
+
+        Friend friendRequest = new Friend(requesterId, receiverId, "PENDING");
+        friendRepository.save(friendRequest);
+
+        return new RedirectView("/users/" + receiverId);
+    }
+
+    @PostMapping("/handleFriendConfirmation")
+    public String handleConfirmation(@RequestParam("action") String action,
+                                 @RequestParam("requesterId") Long requesterId, Principal principal) {
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User receiverId = currentUser.orElse(null);
+        assert receiverId != null;
+
+        if ("accept".equals(action)) {
+            friendRepository.updateStatusByRequesterIdAndReceiverId(requesterId, receiverId.getId(), "ACCEPTED");
+        } else if ("deny".equals(action)) {
+            friendRepository.updateStatusByRequesterIdAndReceiverId(requesterId, receiverId.getId(), "DENIED");
+        }
+
+        return "redirect:/friends";
+    }
+}
diff --git a/src/main/java/com/makersacademy/acebook/controller/HomeController.java b/src/main/java/com/makersacademy/acebook/controller/HomeController.java
index 2036ec7e0..40b353725 100644
--- a/src/main/java/com/makersacademy/acebook/controller/HomeController.java
+++ b/src/main/java/com/makersacademy/acebook/controller/HomeController.java
@@ -4,10 +4,24 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.view.RedirectView;
 
+import javax.servlet.http.HttpSession;
+
 @Controller
 public class HomeController {
 	@RequestMapping(value = "/")
 	public RedirectView index() {
 		return new RedirectView("/posts");
 	}
+
+	@RequestMapping("/login")
+	public String login() {
+		return "login";
+	}
+	@RequestMapping("/logout")
+	public String logout(HttpSession session) {
+		session.removeAttribute("user_id");
+		return "logout";
+	}
+
 }
+
diff --git a/src/main/java/com/makersacademy/acebook/controller/LikeController.java b/src/main/java/com/makersacademy/acebook/controller/LikeController.java
new file mode 100644
index 000000000..1e681d44e
--- /dev/null
+++ b/src/main/java/com/makersacademy/acebook/controller/LikeController.java
@@ -0,0 +1,40 @@
+package com.makersacademy.acebook.controller;
+
+import com.makersacademy.acebook.model.Like;
+import com.makersacademy.acebook.model.User;
+import com.makersacademy.acebook.repository.LikeRepository;
+import com.makersacademy.acebook.repository.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.servlet.view.RedirectView;
+
+import java.security.Principal;
+import java.util.Optional;
+
+@Controller
+public class LikeController {
+    @Autowired
+    LikeRepository likeRepository;
+    @Autowired
+    UserRepository userRepository;
+
+    @PostMapping("/handleLike/{id}")
+    public String handleLike(@PathVariable Long id, Principal principal) {
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+        assert principalUser != null;
+
+        Optional<Like> existingLike = likeRepository.findByUserIdAndPostId(principalUser.getId(), id);
+
+        if (existingLike.isPresent()) {
+            likeRepository.updateLikeStatusByUserIdAndPostId(principalUser.getId(), id);
+        } else {
+            Like newLike = new Like(true, principalUser.getId(), id);
+            likeRepository.save(newLike);
+        }
+
+        return "redirect:/posts";
+    }
+}
diff --git a/src/main/java/com/makersacademy/acebook/controller/PostsController.java b/src/main/java/com/makersacademy/acebook/controller/PostsController.java
index 57a7e5f4d..2baaa9fb4 100644
--- a/src/main/java/com/makersacademy/acebook/controller/PostsController.java
+++ b/src/main/java/com/makersacademy/acebook/controller/PostsController.java
@@ -1,32 +1,81 @@
 package com.makersacademy.acebook.controller;
 
+import com.makersacademy.acebook.model.Like;
 import com.makersacademy.acebook.model.Post;
+import com.makersacademy.acebook.model.User;
+import com.makersacademy.acebook.repository.LikeRepository;
 import com.makersacademy.acebook.repository.PostRepository;
+import com.makersacademy.acebook.repository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.view.RedirectView;
 
-import java.util.List;
+import java.security.Principal;
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Controller
 public class PostsController {
 
     @Autowired
-    PostRepository repository;
+    PostRepository postRepository;
+    @Autowired
+    UserRepository userRepository;
+    @Autowired
+    LikeRepository likeRepository;
 
     @GetMapping("/posts")
-    public String index(Model model) {
-        Iterable<Post> posts = repository.findAll();
-        model.addAttribute("posts", posts);
-        model.addAttribute("post", new Post());
+    public String index(Model model, Principal principal) {
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+        assert principalUser != null;
+
+        Iterable<Post> posts = postRepository.findAllByOrderByTimestampDesc();
+        ArrayList<HashMap<String, Object>> postsAndPosters = new ArrayList<>();
+
+        for (Post post : posts) {
+            HashMap<String, Object> entry = new HashMap<>();
+
+            Optional<User> optionalUser = userRepository.findById(post.getUserId());
+            User poster = optionalUser.orElse(null);
+
+            List<Like> postLikes = likeRepository.countByLikeStatusAndPostId(true, post.getId());
+
+            entry.put("post", post);
+            entry.put("user", poster);
+            entry.put("likes", postLikes);
+
+            postsAndPosters.add(entry);
+        }
+
+        model.addAttribute("postsAndPosters", postsAndPosters);
+        model.addAttribute("newPost", new Post());
+        model.addAttribute("currentUser", principalUser);
+
         return "posts/index";
     }
 
     @PostMapping("/posts")
-    public RedirectView create(@ModelAttribute Post post) {
-        repository.save(post);
+    public RedirectView create(@ModelAttribute Post post, Principal principal,
+                               @RequestParam String fileData) {
+
+//        get and set timestamp of post
+        String timeStamp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new java.util.Date());
+        post.setTimestamp(Timestamp.valueOf(timeStamp));
+
+//        get user and set userid of post
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+        post.setUserId(principalUser.getId());
+
+        post.setPostPhoto(fileData);
+
+//        save post
+        postRepository.save(post);
+
         return new RedirectView("/posts");
     }
 }
diff --git a/src/main/java/com/makersacademy/acebook/controller/UsersController.java b/src/main/java/com/makersacademy/acebook/controller/UsersController.java
index 3c46bf0a1..15823e820 100644
--- a/src/main/java/com/makersacademy/acebook/controller/UsersController.java
+++ b/src/main/java/com/makersacademy/acebook/controller/UsersController.java
@@ -1,17 +1,19 @@
 package com.makersacademy.acebook.controller;
 
-import com.makersacademy.acebook.model.Authority;
-import com.makersacademy.acebook.model.User;
-import com.makersacademy.acebook.repository.AuthoritiesRepository;
-import com.makersacademy.acebook.repository.UserRepository;
+import com.makersacademy.acebook.model.*;
+import com.makersacademy.acebook.repository.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
 
+import java.security.Principal;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.*;
+
 @Controller
 public class UsersController {
 
@@ -19,6 +21,12 @@ public class UsersController {
     UserRepository userRepository;
     @Autowired
     AuthoritiesRepository authoritiesRepository;
+    @Autowired
+    FriendRepository friendRepository;
+    @Autowired
+    PostRepository postRepository;
+    @Autowired
+    LikeRepository likeRepository;
 
     @GetMapping("/users/new")
     public String signup(Model model) {
@@ -27,10 +35,77 @@ public String signup(Model model) {
     }
 
     @PostMapping("/users")
-    public RedirectView signup(@ModelAttribute User user) {
+    public RedirectView signup(@ModelAttribute User user, @RequestParam("fileData") String fileData) {
+        user.setImageUrl(fileData);
+
         userRepository.save(user);
         Authority authority = new Authority(user.getUsername(), "ROLE_USER");
         authoritiesRepository.save(authority);
         return new RedirectView("/login");
     }
+
+    @GetMapping("/users/{id}")
+    public ModelAndView show(@PathVariable Long id, Principal principal, Model model) {
+        Optional<User> pageUser = userRepository.findById(id);
+        User user = pageUser.orElse(null);
+
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+        assert principalUser != null;
+
+        ModelAndView modelAndView = new ModelAndView("/users/show");
+        modelAndView.addObject("currentUser", principalUser);
+        modelAndView.addObject("user", user);
+
+        Iterable<Friend> userRequests = friendRepository.findByRequesterIdOrReceiverId(principalUser.getId(), principalUser.getId());
+
+        for (Friend friend : userRequests) {
+            if (Objects.equals(friend.getReceiverId(), id) || Objects.equals(friend.getRequesterId(), id)) {
+                modelAndView.addObject("userRequest", friend);
+                break;
+            } else {
+                modelAndView.addObject("userRequest", null);
+            }
+        }
+
+        if (principal.getName().equals(Objects.requireNonNull(user).getUsername())) {
+            modelAndView.addObject("isCurrentUser", true);
+        } else {
+            modelAndView.addObject("isCurrentUser", false);
+        }
+
+        Iterable<Post> posts = postRepository.findAllByOrderByTimestampDesc();
+        ArrayList<HashMap<String, Object>> postsAndPosters = new ArrayList<>();
+
+        for (Post post : posts) {
+            HashMap<String, Object> entry = new HashMap<>();
+
+            Optional<User> optionalUser = userRepository.findById(post.getUserId());
+            User poster = optionalUser.orElse(null);
+
+            List<Like> postLikes = likeRepository.countByLikeStatusAndPostId(true, post.getId());
+
+            if (Objects.equals(post.getUserId(), id)) {
+                entry.put("post", post);
+                entry.put("user", poster);
+                entry.put("likes", postLikes);
+
+                postsAndPosters.add(entry);
+            }
+        }
+
+        model.addAttribute("profilePicture", principalUser.getImageUrl());
+        model.addAttribute("postsAndPosters", postsAndPosters);
+
+        return modelAndView;
+    }
+
+    @PostMapping("/handleNewProfile/{id}")
+    public String handleNewProfile(@RequestParam String fileData, @PathVariable Long id) {
+        if (fileData != null && !fileData.isEmpty()) {
+            userRepository.updateImageUrlByUserId(id, fileData);
+        }
+
+        return "redirect:/users/" + id;
+    }
 }
diff --git a/src/main/java/com/makersacademy/acebook/model/Authority.java b/src/main/java/com/makersacademy/acebook/model/Authority.java
index 775b3bde2..2fb5d820e 100644
--- a/src/main/java/com/makersacademy/acebook/model/Authority.java
+++ b/src/main/java/com/makersacademy/acebook/model/Authority.java
@@ -1,7 +1,6 @@
 package com.makersacademy.acebook.model;
 
 import lombok.Data;
-
 import javax.persistence.*;
 
 @Data
diff --git a/src/main/java/com/makersacademy/acebook/model/Comment.java b/src/main/java/com/makersacademy/acebook/model/Comment.java
new file mode 100644
index 000000000..a5f6d262d
--- /dev/null
+++ b/src/main/java/com/makersacademy/acebook/model/Comment.java
@@ -0,0 +1,49 @@
+package com.makersacademy.acebook.model;
+
+
+import lombok.Data;
+import lombok.Getter;
+
+import javax.persistence.*;
+
+
+@Data
+@Entity
+@Table(name = "COMMENTS")
+public class Comment {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Getter
+    private String comment;
+    @Getter
+    private Long postId;
+    @Getter
+    private Long userId;
+
+//    @ManyToOne(cascade = CascadeType.ALL)
+//    @JoinColumn(name = "post_id")
+//    private Post post;
+
+    public Comment() {};
+
+    public Comment(String comment, Long postId, Long userId) {
+        this.comment = comment;
+        this.postId = postId;
+        this.userId = userId;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public void setPostId(Long postId) {
+        this.postId = postId;
+    }
+
+    public void setUserId(Long UserId) {
+        this.userId = UserId;
+    }
+}
diff --git a/src/main/java/com/makersacademy/acebook/model/Friend.java b/src/main/java/com/makersacademy/acebook/model/Friend.java
new file mode 100644
index 000000000..a78bb3c5e
--- /dev/null
+++ b/src/main/java/com/makersacademy/acebook/model/Friend.java
@@ -0,0 +1,40 @@
+package com.makersacademy.acebook.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.GenerationType;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+@Data
+@Entity
+@Table(name = "FRIENDS")
+public class Friend {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    @Getter
+    private Long requesterId;
+    @Getter
+    private Long receiverId;
+    @Getter
+    private String status;
+
+    public Friend() {}
+
+    public Friend(Long requester_id, Long receiver_id, String status) {
+        this.requesterId = requester_id;
+        this.receiverId = receiver_id;
+        this.status = status;
+    }
+
+    public void setRequesterId(Long requester_id) { this.requesterId = requester_id; }
+    public void setReceiverId(Long receiver_id) { this.receiverId = receiver_id; }
+    public void setStatus(String status) { this.status = status; }
+
+}
diff --git a/src/main/java/com/makersacademy/acebook/model/Like.java b/src/main/java/com/makersacademy/acebook/model/Like.java
new file mode 100644
index 000000000..407004615
--- /dev/null
+++ b/src/main/java/com/makersacademy/acebook/model/Like.java
@@ -0,0 +1,41 @@
+package com.makersacademy.acebook.model;
+
+import lombok.Data;
+import lombok.Getter;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@Table(name = "LIKES")
+public class Like {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Getter
+    private Boolean likeStatus = false;
+    @Getter
+    private Long userId;
+    @Getter
+    private Long postId;
+
+    public Like() {};
+    public Like(Boolean likeStatus, Long userId, Long postId) {
+        this.likeStatus = likeStatus;
+        this.userId = userId;
+        this.postId = postId;
+    }
+
+    public void setLikeStatus(Boolean likeStatus) {
+        this.likeStatus = likeStatus;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public void setPostId(Long postId) {
+        this.postId = postId;
+    }
+}
diff --git a/src/main/java/com/makersacademy/acebook/model/Post.java b/src/main/java/com/makersacademy/acebook/model/Post.java
index 0098de1b3..2ee8eed9f 100644
--- a/src/main/java/com/makersacademy/acebook/model/Post.java
+++ b/src/main/java/com/makersacademy/acebook/model/Post.java
@@ -1,29 +1,42 @@
 package com.makersacademy.acebook.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.GenerationType;
+import javax.persistence.*;
 
 import lombok.Data;
+import lombok.Getter;
+
+import java.sql.Timestamp;
+import java.util.List;
 
 @Data
 @Entity
 @Table(name = "POSTS")
 public class Post {
-
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
+    @Getter
     private String content;
+    @Getter
+    String postPhoto;
+    @Getter
+    private Timestamp timestamp;
+    @Getter
+    private Long userId;
 
     public Post() {}
 
-    public Post(String content) {
+    public Post(String content, Timestamp timestamp, Long userId, String postPhoto) {
         this.content = content;
+        this.timestamp = timestamp;
+        this.userId = userId;
+        this.postPhoto = postPhoto;
     }
-    public String getContent() { return this.content; }
     public void setContent(String content) { this.content = content; }
 
+    public void setTimestamp(Timestamp timestamp) { this.timestamp = timestamp; }
+
+    public void setUserId(Long userId) { this.userId = userId; }
+    public void setPostPhoto(String postPhoto) { this.postPhoto = postPhoto; }
 }
diff --git a/src/main/java/com/makersacademy/acebook/model/User.java b/src/main/java/com/makersacademy/acebook/model/User.java
index df2a0edf1..84a10a83d 100644
--- a/src/main/java/com/makersacademy/acebook/model/User.java
+++ b/src/main/java/com/makersacademy/acebook/model/User.java
@@ -7,6 +7,7 @@
 import javax.persistence.GenerationType;
 
 import lombok.Data;
+import lombok.Getter;
 
 import static java.lang.Boolean.TRUE;
 
@@ -14,31 +15,37 @@
 @Entity
 @Table(name = "USERS")
 public class User {
+    @Getter
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+    @Getter
     private String username;
+    @Getter
     private String password;
     private boolean enabled;
+    @Getter String imageUrl;
+
 
     public User() {
         this.enabled = TRUE;
     }
 
-    public User(String username, String password) {
+    public User(String username, String password, String imageUrl) {
         this.username = username;
         this.password = password;
+        this.imageUrl = imageUrl;
         this.enabled = TRUE;
     }
 
-    public User(String username, String password, boolean enabled) {
+    public User(String username, String password, String imageUrl, boolean enabled) {
         this.username = username;
         this.password = password;
+        this.imageUrl = imageUrl;
         this.enabled = enabled;
     }
 
-    public String getUsername() { return this.username; }
-    public String getPassword() { return this.password; }
     public void setUsername(String username) { this.username = username; }
     public void setPassword(String password) { this.password = password; }
+    public void setImageUrl(String imageUrl) { this.imageUrl = imageUrl; }
 }
diff --git a/src/main/java/com/makersacademy/acebook/repository/CommentRepository.java b/src/main/java/com/makersacademy/acebook/repository/CommentRepository.java
new file mode 100644
index 000000000..da839326e
--- /dev/null
+++ b/src/main/java/com/makersacademy/acebook/repository/CommentRepository.java
@@ -0,0 +1,10 @@
+package com.makersacademy.acebook.repository;
+
+import com.makersacademy.acebook.model.Comment;
+import org.springframework.data.repository.CrudRepository;
+
+import java.util.List;
+
+public interface CommentRepository extends CrudRepository<Comment, Long> {
+    public List<Comment> findAllByPostIdOrderById(Long postId);
+}
diff --git a/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java b/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java
new file mode 100644
index 000000000..b551d0612
--- /dev/null
+++ b/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java
@@ -0,0 +1,25 @@
+package com.makersacademy.acebook.repository;
+
+import com.makersacademy.acebook.model.Friend;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
+
+import javax.transaction.Transactional;
+import java.util.List;
+import java.util.Optional;
+
+public interface FriendRepository extends CrudRepository<Friend, Long>  {
+    @Query("SELECT f FROM Friend f WHERE f.receiverId = :receiverId AND f.status = :status")
+    List<Friend> findByStatusAndReceiverId(@Param("receiverId") Long receiverId, @Param("status") String status);
+
+    @Query("SELECT f FROM Friend f WHERE f.requesterId = :requesterId OR f.receiverId = :receiverId")
+    List<Friend> findByRequesterIdOrReceiverId(@Param("requesterId") Long requesterId, @Param("receiverId") Long receiverId);
+
+    @Transactional
+    @Modifying
+    @Query("UPDATE Friend f SET f.status = :status WHERE f.requesterId = :requesterId AND f.receiverId = :receiverId")
+    void updateStatusByRequesterIdAndReceiverId(@Param("requesterId") Long requesterId,
+                                                @Param("receiverId") Long receiverId, @Param("status") String status);
+}
diff --git a/src/main/java/com/makersacademy/acebook/repository/LikeRepository.java b/src/main/java/com/makersacademy/acebook/repository/LikeRepository.java
new file mode 100644
index 000000000..7cd4a665f
--- /dev/null
+++ b/src/main/java/com/makersacademy/acebook/repository/LikeRepository.java
@@ -0,0 +1,21 @@
+package com.makersacademy.acebook.repository;
+
+import com.makersacademy.acebook.model.Like;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
+
+import javax.transaction.Transactional;
+import java.util.List;
+import java.util.Optional;
+
+public interface LikeRepository extends CrudRepository<Like, Long> {
+    public List<Like> countByLikeStatusAndPostId(Boolean likeStatus, Long postId);
+    public Optional<Like> findByUserIdAndPostId(Long userId, Long postId);
+    @Transactional
+    @Modifying
+    @Query("UPDATE Like l SET l.likeStatus = CASE WHEN l.likeStatus = true THEN false ELSE true END WHERE l.userId = :userId AND l.postId = :postId")
+    void updateLikeStatusByUserIdAndPostId(@Param("userId") Long userId,
+                                                @Param("postId") Long postId);
+}
diff --git a/src/main/java/com/makersacademy/acebook/repository/PostRepository.java b/src/main/java/com/makersacademy/acebook/repository/PostRepository.java
index d435e0ce1..de89f3772 100644
--- a/src/main/java/com/makersacademy/acebook/repository/PostRepository.java
+++ b/src/main/java/com/makersacademy/acebook/repository/PostRepository.java
@@ -4,6 +4,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.repository.CrudRepository;
 
-public interface PostRepository extends CrudRepository<Post, Long> {
+import java.util.List;
 
+public interface PostRepository extends CrudRepository<Post, Long> {
+    public List<Post> findAllByOrderByTimestampDesc();
 }
diff --git a/src/main/java/com/makersacademy/acebook/repository/UserRepository.java b/src/main/java/com/makersacademy/acebook/repository/UserRepository.java
index 2cccc950f..39eab452c 100644
--- a/src/main/java/com/makersacademy/acebook/repository/UserRepository.java
+++ b/src/main/java/com/makersacademy/acebook/repository/UserRepository.java
@@ -1,8 +1,19 @@
 package com.makersacademy.acebook.repository;
 
 import com.makersacademy.acebook.model.User;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
 
-public interface UserRepository extends CrudRepository<User, Long> {
+import javax.transaction.Transactional;
+import java.util.Optional;
 
+public interface UserRepository extends CrudRepository<User, Long> {
+    Optional<User> findByUsername(String username);
+    @Transactional
+    @Modifying
+    @Query("UPDATE User u SET u.imageUrl = :imageUrl WHERE u.id = :id")
+    void updateImageUrlByUserId(@Param("id") Long id,
+                                           @Param("imageUrl") String imageUrl);
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index c7ad09d6d..2d031b6d8 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -3,3 +3,5 @@ spring.data.rest.base-path=/api
 spring.datasource.platform=postgres
 spring.jpa.hibernate.ddl-auto=validate
 logging.level.org.springframework.web: DEBUG
+jsf.primefaces.FONT_AWESOME=true
+
diff --git a/src/main/resources/db/migration/V10__update_userid_to_bigint.sql b/src/main/resources/db/migration/V10__update_userid_to_bigint.sql
new file mode 100644
index 000000000..83c91ad42
--- /dev/null
+++ b/src/main/resources/db/migration/V10__update_userid_to_bigint.sql
@@ -0,0 +1,3 @@
+ALTER TABLE posts
+ALTER COLUMN user_id
+TYPE bigint;
diff --git a/src/main/resources/db/migration/V11__update_userid_and_postid_to_bigint.sql b/src/main/resources/db/migration/V11__update_userid_and_postid_to_bigint.sql
new file mode 100644
index 000000000..ccf94621b
--- /dev/null
+++ b/src/main/resources/db/migration/V11__update_userid_and_postid_to_bigint.sql
@@ -0,0 +1,8 @@
+ALTER TABLE comments
+ALTER COLUMN post_id TYPE bigint;
+
+ALTER TABLE comments
+ALTER COLUMN user_id TYPE bigint;
+
+
+
diff --git a/src/main/resources/db/migration/V12__alter_friends_table.sql b/src/main/resources/db/migration/V12__alter_friends_table.sql
new file mode 100644
index 000000000..b5e6e91b5
--- /dev/null
+++ b/src/main/resources/db/migration/V12__alter_friends_table.sql
@@ -0,0 +1,5 @@
+ALTER TABLE FRIENDS
+ALTER COLUMN requester_id TYPE BIGINT;
+
+ALTER TABLE FRIENDS
+ALTER COLUMN receiver_id TYPE BIGINT;
diff --git a/src/main/resources/db/migration/V13__update_posts_with_timestamps.sql b/src/main/resources/db/migration/V13__update_posts_with_timestamps.sql
new file mode 100644
index 000000000..93ea0610b
--- /dev/null
+++ b/src/main/resources/db/migration/V13__update_posts_with_timestamps.sql
@@ -0,0 +1,44 @@
+update
+    posts
+set
+    timestamp = '2023-11-14 11:13:24',
+    user_id = 3
+where
+        content = 'Second post';
+
+
+update
+    posts
+set
+    timestamp = '2023-11-15 11:13:24',
+    user_id = 10
+where
+        content = 'fourth post';
+
+
+update
+    posts
+set
+    timestamp = '2023-11-16 11:13:24',
+    user_id = 11
+where
+        content = 'third post';
+
+
+update
+    posts
+set
+    timestamp = '2023-11-10 11:13:24',
+    user_id = 12
+where
+        content = 'sixth post';
+
+
+update
+    posts
+set
+    timestamp = '2023-11-09 11:13:24',
+    user_id = 14
+where
+        content = 'fifth post';
+
diff --git a/src/main/resources/db/migration/V15__add_user_1_for_testing.sql b/src/main/resources/db/migration/V15__add_user_1_for_testing.sql
new file mode 100644
index 000000000..d4a312101
--- /dev/null
+++ b/src/main/resources/db/migration/V15__add_user_1_for_testing.sql
@@ -0,0 +1,3 @@
+INSERT INTO users
+(username, password, enabled, image_url)
+VALUES ('test_user', 'password22', true, null);
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V16__insert_test_users_into_authorities_table.sql b/src/main/resources/db/migration/V16__insert_test_users_into_authorities_table.sql
new file mode 100644
index 000000000..a2e5d1477
--- /dev/null
+++ b/src/main/resources/db/migration/V16__insert_test_users_into_authorities_table.sql
@@ -0,0 +1,6 @@
+insert into
+    authorities (username, authority)
+values
+   ('zak', 'ROLE_USER'),
+   ('david', 'ROLE_USER'),
+   ('som', 'ROLE_USER');
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V17__add_test_user_to_authorities_table.sql b/src/main/resources/db/migration/V17__add_test_user_to_authorities_table.sql
new file mode 100644
index 000000000..f82b1ff3f
--- /dev/null
+++ b/src/main/resources/db/migration/V17__add_test_user_to_authorities_table.sql
@@ -0,0 +1,4 @@
+insert into
+    authorities (username, authority)
+values
+   ('test_user', 'ROLE_USER');
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V18__update_imageUrl_column_to_text.sql b/src/main/resources/db/migration/V18__update_imageUrl_column_to_text.sql
new file mode 100644
index 000000000..b0eb4c232
--- /dev/null
+++ b/src/main/resources/db/migration/V18__update_imageUrl_column_to_text.sql
@@ -0,0 +1,2 @@
+ALTER TABLE USERS
+ALTER COLUMN image_url TYPE TEXT;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V19__update_likes_table_columns.sql b/src/main/resources/db/migration/V19__update_likes_table_columns.sql
new file mode 100644
index 000000000..e978ea9ba
--- /dev/null
+++ b/src/main/resources/db/migration/V19__update_likes_table_columns.sql
@@ -0,0 +1,5 @@
+ALTER TABLE LIKES
+ALTER COLUMN post_id TYPE BIGINT;
+
+ALTER TABLE LIKES
+ALTER COLUMN user_id TYPE BIGINT;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V20__add_photo_column_to_posts_table.sql b/src/main/resources/db/migration/V20__add_photo_column_to_posts_table.sql
new file mode 100644
index 000000000..a7a249360
--- /dev/null
+++ b/src/main/resources/db/migration/V20__add_photo_column_to_posts_table.sql
@@ -0,0 +1,2 @@
+ALTER TABLE POSTS
+ADD COLUMN post_photo TEXT;
diff --git a/src/main/resources/db/migration/V3__update_existing_create_new_tables.sql b/src/main/resources/db/migration/V3__update_existing_create_new_tables.sql
new file mode 100644
index 000000000..6032cbbfc
--- /dev/null
+++ b/src/main/resources/db/migration/V3__update_existing_create_new_tables.sql
@@ -0,0 +1,38 @@
+ALTER TABLE posts
+ADD COLUMN timestamp timestamp,
+ADD COLUMN user_id integer,
+ADD CONSTRAINT fk_user_id FOREIGN KEY (user_id) REFERENCES users(id);
+
+
+ALTER TABLE users
+ADD image_url varchar(500);
+
+
+CREATE TABLE likes (
+  id bigserial PRIMARY KEY,
+  like_status boolean DEFAULT false,
+  user_id integer,
+  post_id integer,
+  FOREIGN KEY (user_id) REFERENCES users(id),
+  FOREIGN KEY (post_id) REFERENCES posts(id),
+  UNIQUE (user_id, post_id)
+);
+
+
+CREATE TABLE comments (
+  id bigserial PRIMARY KEY,
+  comment varchar(281) NOT NULL,
+  post_id integer,
+  user_id integer,
+  FOREIGN KEY (post_id) REFERENCES posts(id),
+  FOREIGN KEY (user_id) REFERENCES users(id)
+);
+
+CREATE TABLE friends (
+  id bigserial PRIMARY KEY,
+  requester_id integer,
+  receiver_id integer,
+  FOREIGN KEY (requester_id) REFERENCES users(id),
+  FOREIGN KEY (receiver_id) REFERENCES users(id),
+  status varchar(50) check (status in ('ACCEPTED', 'PENDING', 'DENIED'))
+);
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V4__insert_test_data.sql b/src/main/resources/db/migration/V4__insert_test_data.sql
new file mode 100644
index 000000000..26c1fd78d
--- /dev/null
+++ b/src/main/resources/db/migration/V4__insert_test_data.sql
@@ -0,0 +1,7 @@
+insert into users (username, password, enabled, image_url)
+values ('zak', '12345', TRUE, '/users/images/image.png'),
+        ('david', '123456', TRUE, '/users/images/another_image.png');
+
+
+
+
diff --git a/src/main/resources/db/migration/V5__insert_into_posts.sql b/src/main/resources/db/migration/V5__insert_into_posts.sql
new file mode 100644
index 000000000..5df524f2a
--- /dev/null
+++ b/src/main/resources/db/migration/V5__insert_into_posts.sql
@@ -0,0 +1,2 @@
+insert into posts (content, timestamp, user_id)
+values ('first post', '2023-11-14 11:13:24', 2);
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V9__add_new_user.sql b/src/main/resources/db/migration/V9__add_new_user.sql
new file mode 100644
index 000000000..1b26a72e1
--- /dev/null
+++ b/src/main/resources/db/migration/V9__add_new_user.sql
@@ -0,0 +1,2 @@
+insert into users (username, password, enabled, image_url)
+values ('som', '123457', TRUE, '/users/images/image_three.png');
diff --git a/src/main/resources/static/website.css b/src/main/resources/static/website.css
new file mode 100644
index 000000000..292e292e5
--- /dev/null
+++ b/src/main/resources/static/website.css
@@ -0,0 +1,379 @@
+@import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,300;1,400;1,500;1,600;1,700;1,800&display=swap');
+
+html {
+    font-family: 'Poppins', sans-serif;
+}
+
+body {
+    background-color: #f3f3ec;
+    color: black; /* Text color for body */
+    margin: 0;
+    padding: 0;
+}
+
+.header {
+    background-color: #ADD8E6; /* Header background color */
+    color: black; /* Text color for header */
+    padding-left: 35px;
+    display: flex;
+    justify-content: space-between;
+    align-content: stretch;
+    height: 75px;
+}
+
+.header-title {
+    display: flex;
+    margin: 15px 0px;
+    height: 45px;
+}
+
+.header-title-name {
+    margin-right: 5px;
+}
+
+.profile-image {
+    color: black;
+    text-decoration: none;
+    font-size: 1.8rem;
+    border-radius: 50%; /* Make the profile image round */
+    object-fit: cover;
+    margin-right: 10px;
+}
+
+.profile-image img {
+    border-radius: 50%; /* Make the profile image round */
+    object-fit: cover;
+    margin-right: 10px;
+}
+
+.header-title-name {
+    margin-left: 10px;
+    text-transform: capitalize;
+}
+
+.menu-right {
+    display: flex;
+    align-items: center;
+}
+
+.menu-right a {
+    color: black; /* Text color for menu links */
+    margin: 0 10px;
+    text-decoration: none;
+    transform: scale(1.08);
+}
+
+.menu-right a:hover {
+    transform: scale(1.08);
+    color: white;
+}
+
+.menu-right form {
+    margin: 0;
+}
+
+.menu-right input[type="submit"] {
+    background-color: #ADD8E6;
+    color: black;
+    padding: 0px 10px;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    font-size: 16px;
+    transform: scale(1.08);
+}
+
+.menu-right input[type="submit"]:hover {
+    background-color: #ADD8E6;
+}
+
+.contentForm, .commentForm{
+    max-width: 80%;
+    margin: 3.5rem;
+    padding: 20px;
+    background-color: #f3f3ec;
+}
+
+.userSignup, .userLogin {
+    max-width: 50%;
+    margin: 0 auto;
+    padding: 20px;
+    background-color: #fafaf7;
+    border-radius: 5px;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+}
+
+
+textarea{
+    background-color: #f3f3ec;
+}
+
+.listed {
+    max-width: 30%;
+    margin: 0rem;
+    padding: 20px;
+    background-color: #fafaf7;
+    border-radius: 5px;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+}
+
+
+.postContainer {
+    list-style: none;
+}
+
+input[type="text"],
+input[type="password"],
+input[type="file"] {
+    width: 100%;
+    padding: 10px;
+    margin-bottom: 10px;
+    box-sizing: border-box;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    color: black; /* Text color for input fields */
+}
+
+input[type="submit"],
+input[type="reset"] {
+    background-color: #ADD8E6;
+    color: black;
+    padding: 10px 15px;
+    margin-right: 5px;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    transition: transform 0.3s;
+}
+
+input[type="submit"]:hover,
+input[type="reset"]:hover {
+    background-color: #177b90;
+    transform: scale(1.08);
+    color: white;
+}
+
+button {
+    background-color: #ADD8E6;
+    color: black;
+    padding: 10px 15px;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    transition: transform 0.3s;
+}
+
+button:hover {
+    background-color: #177b90;
+    transform: scale(1.08);
+    color: white;
+}
+
+.friendButton {
+    background-color: #ADD8E6;
+    color: black;
+    padding: 10px 15px;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+}
+
+.user-profile-container {
+    display: inline-flex;
+    margin: auto 30px;
+}
+
+.user-profile-heading {
+    display: flex;
+    flex-direction: column;
+    margin: 35px 0px;
+}
+
+.user-profile-title {
+    display: flex;
+    justify-content: center;
+    max-width: 180px;
+    text-transform: capitalize;
+    font-weight: 600;
+    font-size: 20px;
+}
+
+.user-profile-image {
+    color: black;
+    text-decoration: none;
+    font-size: 1.8rem;
+    border-radius: 50%; /* Make the profile image round */
+    object-fit: cover;
+    border: 2px solid black;
+}
+
+.user-profile-request-btn {
+    display: flex;
+    justify-content: center;
+    max-width: 180px;
+}
+
+.user-profile-post {
+    list-style: none;
+}
+
+.user-card-posts {
+    max-width: 100%;
+    margin: 0rem;
+    padding: 20px;
+    background-color: #fafaf7;
+    border-radius: 5px;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    list-style: none;
+}
+
+.user-profile-timeline {
+    width: 700px;
+    margin-top: 20px;
+    list-style: none;
+    padding-inline-start: 0px;
+}
+
+.user-profile-timeline ul {
+    padding-inline-start: 20px;
+}
+
+.user-posts-header {
+    padding-left: 45px;
+}
+
+.profile-with-name {
+    display: flex;
+    align-items: center;
+    text-decoration: none;
+    color: black;
+    transition: transform 0.3s;
+    text-transform: capitalize;
+    font-weight: 600;
+}
+
+.profile-with-name:hover {
+    color: #177b90;
+}
+
+.profile-with-name img {
+    border-radius: 50%; /* Make the profile image round */
+    object-fit: cover;
+    margin-right: 10px;
+}
+
+.comment-like-btns {
+    display: flex;
+    flex-direction: row;
+    justify-content: end;
+    height: 50px;
+}
+
+.posts-timeline {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    width: 700px;
+    margin: 40px auto;
+    list-style: none;
+    padding-inline-start: 0px;
+}
+
+.welcome-title {
+    display: flex;
+    justify-content: center;
+    margin: 15px 0px;
+    height: 45px;
+    padding-left: 40px;
+    font-size: 30px;
+}
+
+.posts-content-form {
+    max-width: 100%;
+    background-color: #f3f3ec;
+    margin-top: 30px;
+}
+
+.posts-content-form #timeline-form-content {
+    width: 94%;
+    padding: 20px;
+}
+
+.timeline-posts {
+    padding-left: 0px;
+}
+
+.posts-form-btns {
+    display: flex;
+    flex-direction: row;
+    justify-content: end;
+    margin-right: 5px;
+}
+
+.post-content {
+    margin-bottom: 20px;
+}
+
+input[type="submit-posts"] {
+    background-color: #ADD8E6;
+    color: black;
+    padding: 10px 15px;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    transition: transform 0.3s;
+}
+
+input[type="submit-posts"]:hover {
+    background-color: #177b90;
+    transform: scale(1.08);
+    color: white;
+}
+
+.requests {
+    list-style: none;
+    width: 200px;
+    margin: 10px;
+    display: inline-grid;
+    align-items: center;
+    justify-items: center;
+}
+
+.request-profile-with-name {
+    text-decoration: none;
+    color: black;
+    transition: transform 0.3s;
+    text-transform: capitalize;
+    font-weight: 600;
+}
+
+.request-profile-with-name:hover {
+    color: #177b90;
+}
+
+.request-profile-with-name img {
+    border-radius: 50%; /* Make the profile image round */
+    object-fit: cover;
+    margin-right: 10px;
+}
+
+.request-user-profile-title {
+    display: flex;
+    justify-content: center;
+    max-width: 180px;
+    text-transform: capitalize;
+    font-weight: 600;
+    font-size: 20px;
+    text-decoration: none;
+    transition: transform 0.3s;
+}
+
+.user-profile-with-name:hover {
+    color: #177b90;
+}
+
+.friends-with-requests {
+    display: flex;
+    flex-direction: row;
+    margin: 0 auto;
+}
\ No newline at end of file
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
new file mode 100644
index 000000000..0ca268afa
--- /dev/null
+++ b/src/main/resources/templates/login.html
@@ -0,0 +1,33 @@
+<html xmlns:th="http://www.thymeleaf.org" xmlns:tiles="http://www.thymeleaf.org">
+<link rel="stylesheet" href="/website.css"/>
+<head>
+    <title tiles:fragment="title">Please log in</title>
+</head>
+<body>
+<div tiles:fragment="content">
+    <form name="f" th:action="@{/login}" method="post" class="userLogin">
+        <fieldset>
+            <legend>Please Login</legend>
+            <div th:if="${param.error}" class="alert alert-error" id="errorMessage">
+                Invalid username and password.
+            </div>
+            <div th:if="${param.logout}" class="alert alert-success">
+                You have been logged out.
+            </div>
+            <label for="username">Username</label>
+            <input type="text" id="username" name="username"/>
+            <label for="password">Password</label>
+            <input type="password" id="password" name="password"/>
+            <div class="form-actions">
+                <button type="submit" id="submit" class="btn">Log in</button>
+            </div>
+        </fieldset>
+    </form>
+    <form name="f" th:action="@{/users/new}" method="get" class="loneSignup">
+        <div>
+            <button id="sign-up-btn" type="submit" class="btn" style=" margin-left: 350; margin-top: 10px;">Sign up</button>
+        </div>
+    </form>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/posts/index.html b/src/main/resources/templates/posts/index.html
index 4eb260155..1de2807fe 100644
--- a/src/main/resources/templates/posts/index.html
+++ b/src/main/resources/templates/posts/index.html
@@ -1,27 +1,97 @@
 <!DOCTYPE html>
-    <html xmlns:th="http://www.thymeleaf.org"
-          xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5" >
-    <head lang="en">
-        <meta charset="UTF-8"/>
-        <title>Acebook</title>
-        <link rel="stylesheet" href="/main.css" />
-    </head>
-    <body>
-
-    <h1>Posts</h1>
-
-    <div sec:authorize="isAuthenticated()">
-        Signed in as <span sec:authentication="name"></span>
+<html lang="en" xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5" >
+<head>
+    <meta charset="UTF-8"/>
+    <title>Acebook</title>
+    <link rel="stylesheet" href="/website.css"/>
+
+    <script>
+        function handleImage(input) {
+            let file = input.files[0];
+            let reader = new FileReader();
+            reader.readAsDataURL(file);
+
+            reader.onload = () => {
+                document.getElementById("fileData").value = reader.result;
+            };
+
+            reader.onerror = () => {
+                alert(reader.error);
+            }
+        }
+    </script>
+</head>
+<body>
+    <div class="header">
+        <a th:href="@{/posts}" class="profile-image">
+            <div class="header-title" sec:authorize="isAuthenticated()">
+                <strong>Acebook</strong>
+            </div>
+        </a>
+        <div class="menu-right">
+            <a href="/friends">Friends</a>
+
+            <!-- Conditional Rendering based on session -->
+            <div th:if="${session.containsKey('user_id')}">
+                <form th:action="@{/logout}" method="post">
+                    <input type="submit" value="Sign Out"/>
+                </form>
+            </div>
+            <div th:unless="${session.containsKey('user_id')}">
+                <a href="/login">Log In</a>
+                <a href="/register">Register</a>
+            </div>
+            <a th:href="@{/users/{id}(id=${currentUser.id})}" class="profile-image">
+                <div class="header-title" sec:authorize="isAuthenticated()">
+                    <img th:src="@{${currentUser.getImageUrl() == '' ? 'https://png.pngtree.com/png-clipart/20230408/original/pngtree-cartoon-leaf-illustration-png-image_9036566.png' : currentUser.getImageUrl()}}" width="45" height="45" alt="Profile Image">
+                </div>
+            </a>
+        </div>
     </div>
 
-    <form action="#" th:action="@{/posts}" th:object="${post}" method="post">
-        <p>Content: <input type="text" th:field="*{content}" /></p>
-        <p><input type="submit" value="Submit" /> <input type="reset" value="Reset" /></p>
-    </form>
+    <div class="posts-timeline">
+        <div class="welcome-title" sec:authorize="isAuthenticated()">
+            Welcome <span sec:authentication="name" class="header-title-name"></span>!
+        </div>
 
-    <ul th:each="post: ${posts}">
-        <li th:text="${post.content}" />
-    </ul>
+        <form action="#" th:action="@{/posts}" th:object="${newPost}" method="post" class="posts-content-form">
+            <textarea type="text" rows="10" placeholder="Write a post..." id=timeline-form-content th:field="*{content}" required></textarea>
+            <label for="postPhoto">Upload a picture</label>
+            <input type="file" id="postPhoto" name="postPhoto" accept="image/*" onChange="handleImage(this)">
+            <input type="hidden" id="fileData" name="fileData" />
+            <p class="posts-form-btns"><input type="submit" id="submit-posts" value="Submit" /> <input type="reset" value="Reset" /></p>
+        </form>
 
+        <ul th:each="map, stat : ${postsAndPosters}" class="timeline-posts">
+            <li class ="user-card-posts">
+                <!-- User info -->
+                <a class="profile-with-name" th:href="@{/users/{id}(id=${map.user.getId()})}">
+                    <img th:src="${map.user.getImageUrl() == '' ? 'https://png.pngtree.com/png-clipart/20230408/original/pngtree-cartoon-leaf-illustration-png-image_9036566.png' : map.user.getImageUrl()}" width="40" height="40" />
+                    <p th:text="${map.user.getUsername()}"></p>
+                </a>
+
+                <!-- Post Content -->
+                <div class="post-content">
+                    <p th:text="${map.post.getContent()}"></p>
+                    <div th:if="${map.post.getPostPhoto() != '' && map.post.getPostPhoto() != null}">
+                        <img th:src="${map.post.getPostPhoto()}" alt="an image" width="400" height="350" />
+                    </div>
+                </div>
+
+                <!-- Form for commenting -->
+                <div class="comment-like-btns">
+                    <form action="#" th:action="@{/post/{id}(id=${map.post.getId()})}" method="get">
+                        <input type="submit" id="comment" value="Comment" />
+                    </form>
+
+                    <!-- Form for liking -->
+                    <form action="#" th:action="@{/handleLike/{id}(id=${map.post.getId()})}" method="post">
+                        <input type="submit" id="like" th:value="'Like ' + ${map.likes.get(0)}" />
+                    </form>
+                </div>
+            </li>
+        </ul>
+    </div>
     </body>
 </html>
diff --git a/src/main/resources/templates/posts/show.html b/src/main/resources/templates/posts/show.html
new file mode 100644
index 000000000..d6f281080
--- /dev/null
+++ b/src/main/resources/templates/posts/show.html
@@ -0,0 +1,77 @@
+<!doctype html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <link rel="stylesheet" href="/website.css"/>
+    <title>Acebook</title>
+</head>
+<body>
+
+    <div class="header">
+        <a th:href="@{/posts}" class="profile-image">
+            <div class="header-title" sec:authorize="isAuthenticated()">
+                <strong>Acebook</strong>
+            </div>
+        </a>
+        <div class="menu-right">
+            <a href="/friends">Friends</a>
+
+            <!-- Conditional Rendering based on session -->
+            <div th:if="${session.containsKey('user_id')}">
+                <form th:action="@{/logout}" method="post">
+                    <input type="submit" value="Sign Out"/>
+                </form>
+            </div>
+            <div th:unless="${session.containsKey('user_id')}">
+                <a href="/login">Log In</a>
+                <a href="/register">Register</a>
+            </div>
+            <a th:href="@{/users/{id}(id=${principalUser.getId()})}" class="profile-image">
+                <div class="header-title" sec:authorize="isAuthenticated()">
+                    <img th:src="@{${principalUser.getImageUrl() == '' ? 'https://png.pngtree.com/png-clipart/20230408/original/pngtree-cartoon-leaf-illustration-png-image_9036566.png' : principalUser.getImageUrl()}}" width="45" height="45" alt="Profile Image">
+                </div>
+            </a>
+        </div>
+    </div>
+
+    <div class="posts-timeline">
+        <div class="user-card-posts">
+            <a class="profile-with-name" th:href="@{/users/{id}(id=${postOwner.id})}">
+                <img th:src="${postOwner.getImageUrl() == '' ? 'https://png.pngtree.com/png-clipart/20230408/original/pngtree-cartoon-leaf-illustration-png-image_9036566.png' : postOwner.getImageUrl()}" width="40" height="40"/>
+                <span th:text="${postOwner.getUsername()}"></span>
+            </a>
+            <p class="post-content" th:text="${currentPost.content}"></p>
+        </div>
+
+        <!--    Form to add a comment to post -->
+        <form action="#" th:action="@{/post/addComment}" th:object="${newComment}" method="post" class="posts-content-form">
+        <textarea type="text" rows="5" placeholder="Write a comment..." id=timeline-form-content th:field="*{comment}">
+        </textarea>
+            <input type="hidden" name="postId" th:value="${currentPost.id}"/>
+            <p class="posts-form-btns">
+                <input type="submit" id="submitComment" value="Submit"/>
+                <input type="reset" value="Reset"/>
+            </p>
+        </form>
+
+        <h6 class="welcome-title">Comments</h6>
+        <!--List each comment and associated user-->
+        <ul th:each="entry: ${commentsAndOwners.entrySet()}" class="timeline-posts">
+            <li class="user-card-posts">
+                <a class="profile-with-name" th:href="@{/users/{id}(id=${entry.getValue().getId()})}">
+                        <!--            users image-->
+                    <img th:src="${entry.getValue().getImageUrl() == '' ? 'https://png.pngtree.com/png-clipart/20230408/original/pngtree-cartoon-leaf-illustration-png-image_9036566.png' : entry.getValue().getImageUrl()}" width="40" height="40"/>
+                        <!--            users username-->
+                    <span th:text="${entry.getValue().getUsername()}"></span>
+                        <!--            comment contents-->
+                </a>
+                <p class="post-content" th:text="${entry.getKey().getComment()}"></p>
+            </li>
+        </ul>
+    </div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/users/friends.html b/src/main/resources/templates/users/friends.html
new file mode 100644
index 000000000..74d332923
--- /dev/null
+++ b/src/main/resources/templates/users/friends.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html lang="en"  xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
+
+<head>
+    <meta charset="UTF-8">
+  <link rel="stylesheet" href="/website.css"/>
+  <title>Friends</title>
+</head>
+<body>
+  
+<div class="header">
+  <a th:href="@{/posts}" class="profile-image">
+    <div class="header-title" sec:authorize="isAuthenticated()">
+      <strong>Acebook</strong>
+    </div>
+  </a>
+  <div class="menu-right">
+    <a href="/friends">Friends</a>
+
+    <!-- Conditional Rendering based on session -->
+    <div th:if="${session.containsKey('user_id')}">
+      <form th:action="@{/logout}" method="post">
+        <input type="submit" value="Sign Out"/>
+      </form>
+    </div>
+    <div th:unless="${session.containsKey('user_id')}">
+      <a href="/login">Log In</a>
+      <a href="/register">Register</a>
+    </div>
+    <a th:href="@{/users/{id}(id=${currentUser.getId()})}" class="profile-image">
+      <div class="header-title" sec:authorize="isAuthenticated()">
+        <img th:src="@{${profilePicture == '' ? 'https://png.pngtree.com/png-clipart/20230408/original/pngtree-cartoon-leaf-illustration-png-image_9036566.png' : profilePicture}}" width="45" height="45" alt="Profile Image">
+      </div>
+    </a>
+  </div>
+</div>
+
+  <h6 class="welcome-title">Friends</h6>
+  <div class="friends-with-requests">
+    <div class="friends-list">
+      <ul>
+        <li th:each="friend : ${friends}" class="requests">
+          <a class="request-profile-with-name" th:href="@{/users/{id}(id=${friend.id})}">
+            <img th:src="${friend.getImageUrl() == '' ? 'https://png.pngtree.com/png-clipart/20230408/original/pngtree-cartoon-leaf-illustration-png-image_9036566.png' : friend.getImageUrl()}" width="180" height="180" alt="Profile Image" class="user-profile-image">
+            <span th:text="${friend.getUsername()}" class="request-user-profile-title"></span>
+          </a>
+        </li>
+      </ul>
+    </div>
+    <div class="friend-requests">
+      <ul>
+        <li class="requests" th:each="user : ${friendRequests}">
+          <a class="request-profile-with-name" th:href="@{/users/{id}(id=${user.id})}">
+            <img th:src="${user.imageUrl}" width="180" height="180" alt="Profile Image" class="user-profile-image">
+<!--            <img th:src="${user.imageUrl == '' ? 'https://png.pngtree.com/png-clipart/20230408/original/pngtree-cartoon-leaf-illustration-png-image_9036566.png' : user.imageUrl()}" width="180" height="180" alt="Profile Image" class="user-profile-image">-->
+            <span th:text="${user.username}" class="request-user-profile-title"></span>
+          </a>
+
+          <form th:action="@{/handleFriendConfirmation}" method="post">
+            <input type="hidden" name="requesterId" th:value="${user.id}" />
+            <button type="submit" name="action" value="accept">Accept</button>
+            <button type="submit" name="action" value="deny">Deny</button>
+          </form>
+        </li>
+      </ul>
+    </div>
+  </div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/users/new.html b/src/main/resources/templates/users/new.html
index 2d763f396..3556b66a2 100644
--- a/src/main/resources/templates/users/new.html
+++ b/src/main/resources/templates/users/new.html
@@ -1,14 +1,33 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<html lang="en">
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
     <head>
         <meta charset="UTF-8">
+        <link rel="stylesheet" href="/website.css"/>
+
         <title>Signup</title>
+
+        <script>
+            function handleImage(input) {
+                let file = input.files[0];
+                let reader = new FileReader();
+                reader.readAsDataURL(file);
+
+                reader.onload = () => {
+                    document.getElementById("fileData").value = reader.result;
+                };
+
+                reader.onerror = () => {
+                    alert(reader.error);
+                }
+            }
+        </script>
     </head>
     <body>
-        <form action="#" th:action="@{/users}" th:object="${user}" method="post">
-            <p>Username: <input type="text" th:field="*{username}" /></p>
-            <p>Password: <input type="password" th:field="*{password}" /></p>
+        <form action="#" th:action="@{/users}" th:object="${user}" method="post" class="userSignup">
+            <p>Username: <input type="text" th:field="*{username}" required /></p>
+            <p>Password: <input type="password" th:field="*{password}" required /></p>
+            <p>Profile Picture: <input type="file" id="file" accept="image/*" onChange="handleImage(this)" th:field="*{imageUrl}" /></p>
+            <input type="hidden" id="fileData" name="fileData" />
             <p><input type="submit" value="Submit" id="submit"/> <input type="reset" value="Reset" /></p>
         </form>
     </body>
diff --git a/src/main/resources/templates/users/show.html b/src/main/resources/templates/users/show.html
new file mode 100644
index 000000000..31131194f
--- /dev/null
+++ b/src/main/resources/templates/users/show.html
@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5" >
+<head>
+    <meta charset="UTF-8"/>
+    <title th:text="${user.username} + '\'s Profile'"></title>
+    <link rel="stylesheet" href="/website.css"/>
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/fontawesome.min.css" rel="stylesheet" type="text/css" />
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/regular.min.css" rel="stylesheet" type="text/css" />
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.css" rel="stylesheet" type="text/css" />
+
+    <script>
+        function sendFriendRequest() {
+            document.getElementById('friendRequestForm').submit();
+        }
+
+        function handleImage(input) {
+            let file = input.files[0];
+            let reader = new FileReader();
+            reader.readAsDataURL(file);
+
+            reader.onload = () => {
+                document.getElementById("fileData").value = reader.result;
+            };
+
+            reader.onerror = () => {
+                alert(reader.error);
+            }
+        }
+    </script>
+</head>
+<body>
+
+    <div class="header">
+        <a th:href="@{/posts}" class="profile-image">
+            <div class="header-title" sec:authorize="isAuthenticated()">
+                <strong>Acebook</strong>
+            </div>
+        </a>
+        <div class="menu-right">
+            <a href="/friends">Friends</a>
+
+            <!-- Conditional Rendering based on session -->
+            <div th:if="${session.containsKey('user_id')}">
+                <form th:action="@{/logout}" method="post">
+                    <input type="submit" value="Sign Out"/>
+                </form>
+            </div>
+            <div th:unless="${session.containsKey('user_id')}">
+                <a href="/login">Log In</a>
+                <a href="/register">Register</a>
+            </div>
+            <a th:href="@{/users/{id}(id=${currentUser.id})}" class="profile-image">
+                <div class="header-title" sec:authorize="isAuthenticated()">
+                    <img th:src="@{${profilePicture == '' ? 'https://png.pngtree.com/png-clipart/20230408/original/pngtree-cartoon-leaf-illustration-png-image_9036566.png' : profilePicture}}" width="45" height="45" alt="Profile Image">
+                </div>
+            </a>
+        </div>
+    </div>
+
+    <div class="user-profile-container">
+        <div class="user-profile-heading">
+            <img th:src="${user.getImageUrl() == '' ? 'https://png.pngtree.com/png-clipart/20230408/original/pngtree-cartoon-leaf-illustration-png-image_9036566.png' : user.getImageUrl()}" width="180" height="180" alt="Profile Image" class="user-profile-image">
+            <h1 th:text="${user.username}" class="user-profile-title"></h1>
+
+            <div th:if="${!isCurrentUser}" class="user-profile-request-btn">
+                <form id="friendRequestForm" action="#" th:action="@{/handleFriendRequest}" method="post">
+                    <input type="hidden" name="requester_id" th:value="${currentUser.id}" />
+                    <input type="hidden" name="receiver_id" th:value="${user.id}" />
+
+                    <div th:if="${userRequest != null and userRequest.status != 'DENIED'}">
+                        <p th:text="${userRequest.getStatus() == 'ACCEPTED' ? 'Friends' : 'Request Sent'}"></p>
+                    </div>
+
+                    <div th:if="${userRequest == null or userRequest.status == 'DENIED'}">
+                        <button onclick="sendFriendRequest()">Send Friend Request</button>
+                    </div>
+                </form>
+            </div>
+
+            <!--upload new photo-->
+            <div th:if="${isCurrentUser}">
+                <form id="newProfileForm" action="#" th:action="@{/handleNewProfile/{id}(id=${currentUser.getId()})}" method="post">
+                    <input type="file" id="newProfile" accept="image/*" onChange="handleImage(this)" required />
+                    <input type="hidden" id="fileData" name="fileData" />
+                    <button type="submit">Update Photo</button>
+                </form>
+            </div>
+        </div>
+
+        <div class="user-profile-timeline">
+            <h3 class="user-posts-header">Posts</h3>
+
+            <ul th:each="map, stat : ${postsAndPosters}" class="user-profile-posts">
+                <li class ="user-card-posts">
+                    <div>
+                        <a class="profile-with-name" th:href="@{/users/{id}(id=${map.user.getId()})}">
+                            <img th:src="${map.user.getImageUrl() == '' ? 'https://png.pngtree.com/png-clipart/20230408/original/pngtree-cartoon-leaf-illustration-png-image_9036566.png' : map.user.getImageUrl()}" width="40" height="40" />
+                            <p th:text="${map.user.getUsername()}"></p>
+                        </a>
+                    </div>
+
+                    <div class="post-content">
+                        <p th:text="${map.post.getContent()}"></p>
+                    </div>
+
+                    <div class="comment-like-btns">
+                        <form action="#" th:action="@{/post/{id}(id=${map.post.getId()})}" method="get">
+                            <p>
+                                <input type="submit" id="comment" value="Comment" class="btn fa-input" />
+                                <input type="submit" id="like" th:value="'Like ' + ${map.likes.get(0)}"/>
+                            </p>
+                        </form>
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+    </div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/test/java/SignUpTest.java b/src/test/java/SignUpTest.java
index b0e16955b..42ba25f74 100644
--- a/src/test/java/SignUpTest.java
+++ b/src/test/java/SignUpTest.java
@@ -7,7 +7,10 @@
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
 import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.WebDriverWait;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -38,6 +41,25 @@ public void successfulSignUpRedirectsToSignIn() {
         driver.findElement(By.id("password")).sendKeys("password");
         driver.findElement(By.id("submit")).click();
         String title = driver.getTitle();
-        Assert.assertEquals("Please sign in", title);
+        Assert.assertEquals("Please log in", title);
+    }
+
+
+    @Test
+    public void signUpButtonLinksToSignUpPage() {
+        driver.get("http://localhost:8080/login");
+        driver.findElement(By.id("sign-up-btn")).click();
+        String title = driver.getTitle();
+        Assert.assertEquals("Signup", title);
+    }
+
+    @Test
+    public void testBlankUsernameStaysOnPage() {
+        driver.get("http://localhost:8080/users/new");
+        driver.findElement(By.id("username")).sendKeys(" ");
+        driver.findElement(By.id("password")).sendKeys("password");
+        driver.findElement(By.id("submit")).click();
+        String currentURL = driver.getCurrentUrl();
+        Assert.assertEquals("http://localhost:8080/users", currentURL);
     }
 }
diff --git a/src/test/java/com/makersacademy/acebook/model/PostTest.java b/src/test/java/com/makersacademy/acebook/model/PostTest.java
index 732aafc6e..59d8dfa39 100644
--- a/src/test/java/com/makersacademy/acebook/model/PostTest.java
+++ b/src/test/java/com/makersacademy/acebook/model/PostTest.java
@@ -5,13 +5,22 @@
 
 import org.junit.Test;
 
+import java.sql.Timestamp;
+
 public class PostTest {
 
-	private Post post = new Post("hello");
+	Timestamp timestamp = Timestamp.valueOf("2007-09-23 10:10:10.0");;
+
+	private Post post = new Post("hello", timestamp, 1L, "empty");
 
 	@Test
 	public void postHasContent() {
 		assertThat(post.getContent(), containsString("hello"));
 	}
 
+	@Test
+	public void postHasU() {
+		assertThat(post.getContent(), containsString("hello"));
+	}
+
 }
diff --git a/src/test/java/com/makersacademy/aceboook/controller/CommentControllerTest.java b/src/test/java/com/makersacademy/aceboook/controller/CommentControllerTest.java
new file mode 100644
index 000000000..ed8ecc610
--- /dev/null
+++ b/src/test/java/com/makersacademy/aceboook/controller/CommentControllerTest.java
@@ -0,0 +1,65 @@
+package com.makersacademy.aceboook.controller;
+
+import com.github.javafaker.Faker;
+import com.makersacademy.acebook.Application;
+import com.makersacademy.acebook.repository.CommentRepository;
+import com.makersacademy.acebook.repository.PostRepository;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.List;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = Application.class)
+public class CommentControllerTest {
+
+
+    @Autowired
+    PostRepository postRepository;
+
+    @Autowired
+    CommentRepository commentRepository;
+
+    WebDriver driver;
+    Faker faker;
+
+    @Before
+    public void setup() {
+        System.setProperty("webdriver.chrome.driver", "/usr/local/bin/chromedriver");
+        driver = new ChromeDriver();
+        faker = new Faker();
+    }
+
+    @After
+    public void tearDown() {
+        driver.close();
+    }
+
+    @Test
+    public void testAddCommentReflectedInCommentsList() {
+        driver.get("http://localhost:8080/login");
+        driver.findElement(By.id("username")).sendKeys("test_user");
+        driver.findElement(By.id("password")).sendKeys("password22");
+        driver.findElement(By.id("submit")).click();
+        driver.findElement(By.id("comment")).click();
+        driver.findElement(By.id("addComment")).sendKeys("Here is my new comment!");
+        driver.findElement(By.id("submitComment")).click();
+
+        List<WebElement> commentsList = driver.findElements(By.id("commentContent"));
+        String comment = commentsList.get(commentsList.size() -1).getText();
+
+        Assert.assertEquals("Here is my new comment!", comment);
+    }
+
+
+}
diff --git a/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java b/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java
new file mode 100644
index 000000000..da44dc267
--- /dev/null
+++ b/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java
@@ -0,0 +1,96 @@
+package com.makersacademy.aceboook.controller;
+
+import com.github.javafaker.Faker;
+import com.makersacademy.acebook.Application;
+import com.makersacademy.acebook.model.Post;
+import com.makersacademy.acebook.repository.PostRepository;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.WebDriverWait;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.List;
+
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = Application.class)
+public class PostControllerTest {
+
+
+    @Autowired
+    PostRepository postRepository;
+
+    WebDriver driver;
+    Faker faker;
+
+    @Before
+    public void setup() {
+        System.setProperty("webdriver.chrome.driver", "/usr/local/bin/chromedriver");
+        driver = new ChromeDriver();
+        faker = new Faker();
+    }
+
+    @After
+    public void tearDown() {
+        driver.close();
+    }
+
+    @Test
+    public void testNewPostIsAtTheTopOfList() {
+        driver.get("http://localhost:8080/login");
+        driver.findElement(By.id("username")).sendKeys("test_user");
+        driver.findElement(By.id("password")).sendKeys("password22");
+        driver.findElement(By.id("submit")).click();
+        driver.findElement(By.id("timeline-form-content")).sendKeys("New Post");
+        driver.findElement(By.id("submit-posts")).click();
+
+        List<WebElement> postList = driver.findElements(By.id("postContent"));
+        String newPost = postList.get(0).getText();
+
+        Assert.assertEquals("New Post", newPost);
+    }
+
+    @Test
+    public void testNewPostHasUserIdAssigned() {
+        driver.get("http://localhost:8080/login");
+        driver.findElement(By.id("username")).sendKeys("test_user");
+        driver.findElement(By.id("password")).sendKeys("password22");
+        driver.findElement(By.id("submit")).click();
+        WebDriverWait wait = new WebDriverWait(driver, 10);
+        wait.until(ExpectedConditions.visibilityOfElementLocated(By.id("timeline-form-content")));
+        driver.findElement(By.id("timeline-form-content")).sendKeys("New Post");
+        driver.findElement(By.id("submit-posts")).click();
+        List<Post> posts = postRepository.findAllByOrderByTimestampDesc();
+        Post latestPost = posts.get(0);
+        Long userId = latestPost.getUserId();
+        Long expected = 4L;
+        Assert.assertEquals(expected, userId);
+    }
+
+    @Test
+    public void testCommentButtonNavigatesToPostPageFromPosts() {
+        driver.get("http://localhost:8080/login");
+        driver.findElement(By.id("username")).sendKeys("test_user");
+        driver.findElement(By.id("password")).sendKeys("password22");
+        driver.findElement(By.id("submit")).click();
+        driver.findElement(By.id("timeline-form-content")).sendKeys("Testing Comment Button");
+        driver.findElement(By.id("submit-posts")).click();
+        driver.findElement(By.id("comment")).click();
+        WebElement h3Element = driver.findElement(By.tagName("h3"));
+        String h3Text = h3Element.getText();
+        Assert.assertEquals("Testing Comment Button", h3Text);
+
+    }
+
+
+}
diff --git a/src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java b/src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java
new file mode 100644
index 000000000..b7f351105
--- /dev/null
+++ b/src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java
@@ -0,0 +1,49 @@
+package com.makersacademy.aceboook.controller;
+
+import com.github.javafaker.Faker;
+import com.makersacademy.acebook.Application;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = Application.class)
+public class UsersControllerTest {
+
+    WebDriver driver;
+    WebDriver page;
+    Faker faker;
+
+    @Before
+    public void setup() {
+        System.setProperty("webdriver.chrome.driver", "/usr/local/bin/chromedriver");
+        driver = new ChromeDriver();
+        faker = new Faker();
+    }
+
+    @After
+    public void tearDown() {
+        driver.close();
+    }
+
+    @Test
+    public void usersCanReadUsername() {
+        driver.get("http://localhost:8080/login");
+        driver.findElement(By.id("username")).sendKeys("test_user");
+        driver.findElement(By.id("password")).sendKeys("password22");
+        driver.findElement(By.id("submit")).click();
+        driver.get("http://localhost:8080/users/4");
+        WebElement pElement = driver.findElement(By.id("profileUsername"));
+        String pText = pElement.getText();
+        Assert.assertEquals("Test_User", pText);
+
+    }
+}