diff --git a/pom.xml b/pom.xml
index eddba5d0..7651ef54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,27 +30,43 @@
 	</dependencyManagement>
 
 	<dependencies>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<scope>runtime</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<scope>runtime</scope>
+			<optional>true</optional>
 		</dependency>
-
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
 			<scope>runtime</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-
-
 		<dependency>
 			<groupId>com.amazonaws</groupId>
 			<artifactId>aws-java-sdk-s3</artifactId>
@@ -60,6 +76,130 @@
 			<artifactId>aws-java-sdk-dynamodb</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.hibernate.javax.persistence</groupId>
+			<artifactId>hibernate-jpa-2.1-api</artifactId>
+			<version>1.0.2.Final</version>
+		</dependency>
+
+
+<!-- Adding these two dependencies made it work!!!-->
+		<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.3.1</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.javassist/javassist -->
+		<dependency>
+			<groupId>org.javassist</groupId>
+			<artifactId>javassist</artifactId>
+			<version>3.25.0-GA</version>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.thetransactioncompany/cors-filter -->
+		<dependency>
+			<groupId>com.thetransactioncompany</groupId>
+			<artifactId>cors-filter</artifactId>
+			<version>2.8</version>
+		</dependency>
+		<!-- testing -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.hamcrest</groupId>
+					<artifactId>hamcrest-core</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<version>1.3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>1.10.19</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.hamcrest</groupId>
+					<artifactId>hamcrest-core</artifactId>
+				</exclusion>
+			</exclusions>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.jayway.jsonpath</groupId>
+			<artifactId>json-path-assert</artifactId>
+			<version>2.2.0</version>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.hamcrest</groupId>
+					<artifactId>hamcrest-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-params</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.platform</groupId>
+			<artifactId>junit-platform-launcher</artifactId>
+			<version>1.3.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<version>5.3.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-junit-jupiter</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>1.11.3</version>
+			<scope>test</scope>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.9.5</version>
+			<scope>test</scope>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.8.6</version>
+		</dependency>
 
 	</dependencies>
 
diff --git a/src/main/java/com/tresmigos/fullstackvideo/Main.java b/src/main/java/com/tresmigos/fullstackvideo/Main.java
index ce4b0efb..9aa9c28f 100644
--- a/src/main/java/com/tresmigos/fullstackvideo/Main.java
+++ b/src/main/java/com/tresmigos/fullstackvideo/Main.java
@@ -5,8 +5,12 @@
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.Tag;
 import com.tresmigos.fullstackvideo.filestore.FileStore;
+import com.tresmigos.fullstackvideo.model.Account;
 import com.tresmigos.fullstackvideo.service.AwsServiceClient;
 
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
 import java.util.List;
 
 public class Main {
@@ -20,6 +24,11 @@ public static void main(String[] args) {
 //            System.out.println(tag.getValue());
 //        }
 
+//        EntityManagerFactory emf = Persistence.createEntityManagerFactory("pu");
+//        EntityManager em = emf.createEntityManager();
+//
+//        Account account = em.find(Account.class, 1);
+
     }
 
 }
diff --git a/src/main/java/com/tresmigos/fullstackvideo/controller/AccountController.java b/src/main/java/com/tresmigos/fullstackvideo/controller/AccountController.java
index f681f8b7..ba151936 100644
--- a/src/main/java/com/tresmigos/fullstackvideo/controller/AccountController.java
+++ b/src/main/java/com/tresmigos/fullstackvideo/controller/AccountController.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 @RestController
-@CrossOrigin(origins = "http://localhost:3001")
+@CrossOrigin(origins = "*")
 @RequestMapping(value = "/account") // We don't need to state that it's a controller in the query because of redundancy.
 public class AccountController {
     private AccountRepository accountRepository;
diff --git a/src/main/java/com/tresmigos/fullstackvideo/controller/CommentController.java b/src/main/java/com/tresmigos/fullstackvideo/controller/CommentController.java
new file mode 100644
index 00000000..66ae37ef
--- /dev/null
+++ b/src/main/java/com/tresmigos/fullstackvideo/controller/CommentController.java
@@ -0,0 +1,50 @@
+package com.tresmigos.fullstackvideo.controller;
+
+import com.tresmigos.fullstackvideo.model.Comment;
+import com.tresmigos.fullstackvideo.service.CommentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@CrossOrigin(origins = "*")
+@RequestMapping(value = "/comment")
+public class CommentController {
+    @Autowired
+    CommentService service;
+
+    @PostMapping("/")
+    public ResponseEntity<Comment> createComment(@RequestBody Comment comment) {
+        return new ResponseEntity<>(service.create(comment), HttpStatus.CREATED);
+    }
+
+    @GetMapping("/{id}")
+    public ResponseEntity<Comment> readCommentById(@PathVariable Long id) {
+        return new ResponseEntity<>(service.read(id), HttpStatus.OK);
+    }
+
+    @GetMapping("/allComment")
+    public ResponseEntity<List<Comment>> readAllComments() {
+        return new ResponseEntity<>(service.readAll(), HttpStatus.OK);
+    }
+
+    @PutMapping("/update/{id}")
+    public ResponseEntity<Comment> updatePost(@PathVariable Long id, @RequestBody Comment comment) {
+        return new ResponseEntity<>(service.update(id, comment), HttpStatus.OK);
+    }
+
+    @DeleteMapping("/delete")
+    public ResponseEntity<Comment> deletePost(@RequestBody Comment comment) {
+        return new ResponseEntity<>(service.delete(comment), HttpStatus.OK);
+    }
+
+    @DeleteMapping("/delete/{id}")
+    public ResponseEntity<Comment> deletePostById(@PathVariable Long id) {
+        return new ResponseEntity<>(service.delete(id), HttpStatus.OK);
+    }
+
+
+}
diff --git a/src/main/java/com/tresmigos/fullstackvideo/controller/VideoController.java b/src/main/java/com/tresmigos/fullstackvideo/controller/VideoController.java
index e39e49b0..dd909929 100644
--- a/src/main/java/com/tresmigos/fullstackvideo/controller/VideoController.java
+++ b/src/main/java/com/tresmigos/fullstackvideo/controller/VideoController.java
@@ -13,11 +13,11 @@
 
 @RestController
 @RequestMapping(value = "/video")
-@CrossOrigin(origins = "http://localhost:3001")
+@CrossOrigin(origins = "*")
 public class VideoController {
 
     @Autowired
-    private VideoService service;
+    VideoService service;
 
     @Autowired
     private AwsServiceClient AWS_CLIENT;
@@ -47,10 +47,10 @@ public ResponseEntity<Video> read(@PathVariable Long id) {
         return new ResponseEntity<>(service.read(id),HttpStatus.OK);
     }
 
-    @PutMapping(value = "/update/{id}")
-    public ResponseEntity<Video> updateVideoById(@PathVariable Long id, @RequestBody Video newVideo){
-        return new ResponseEntity<>(service.update(id, newVideo), HttpStatus.OK);
-    }
+//    @PutMapping(value = "/update/{id}")
+//    public ResponseEntity<Video> updateVideoById(@PathVariable Long id, @RequestBody Video newVideo){
+//        return new ResponseEntity<>(service.update(id, newVideo), HttpStatus.OK);
+//    }
 
     @DeleteMapping(value = "/delete/{id}")
     public ResponseEntity<Video> deleteVideoById(@PathVariable Long id){
diff --git a/src/main/java/com/tresmigos/fullstackvideo/filestore/FileStore.java b/src/main/java/com/tresmigos/fullstackvideo/filestore/FileStore.java
index 0af4d50e..9a8e9b1c 100644
--- a/src/main/java/com/tresmigos/fullstackvideo/filestore/FileStore.java
+++ b/src/main/java/com/tresmigos/fullstackvideo/filestore/FileStore.java
@@ -43,9 +43,7 @@ public void save(String filePath, String fileName, Optional<Map<String, String>>
         } catch(AmazonServiceException e){
             throw new IllegalStateException("Failed to store file to S3", e);
         }
-
-
-
+//hey
     }
 
 
diff --git a/src/main/java/com/tresmigos/fullstackvideo/model/Account.java b/src/main/java/com/tresmigos/fullstackvideo/model/Account.java
index 8211c97e..66452841 100644
--- a/src/main/java/com/tresmigos/fullstackvideo/model/Account.java
+++ b/src/main/java/com/tresmigos/fullstackvideo/model/Account.java
@@ -1,39 +1,41 @@
 package com.tresmigos.fullstackvideo.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import javax.persistence.*;
-import java.util.Set;
+import java.util.List;
 
 @Entity
+@Table(name = "accounts_inDB")
 public class Account {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "ACCOUNT_ID")
+    //@Column(name = "ACCOUNT_ID")
     private Long id;
     private String username;
     private String password;
 
-    @OneToMany(cascade = CascadeType.ALL)
-    @JoinColumn(name = "ACCOUNT_ID")
-    @OrderBy
-    Set<Video> videos;
+    @OneToMany(mappedBy = "account")
+    @JsonIgnore
+    private List<Video> videos;
 
     public Account() {
     }
 
-    public Account(Long id, String username, String password, Set<Video> videos) {
+    public Account(Long id, String username, String password, List<Video> videos) {
         this.id = id;
         this.username = username;
         this.password = password;
         this.videos = videos;
     }
 
-    public Long getId() {
+    public Long getAccountId() {
         return id;
     }
 
-    public void setId(Long id) {
-        this.id = id;
+    public void setAccountId(Long accountId) {
+        this.id = accountId;
     }
 
     public String getUsername() {
@@ -52,11 +54,21 @@ public void setPassword(String password) {
         this.password = password;
     }
 
-    public Set<Video> getVideos() {
+    public List<Video> getVideos() {
         return videos;
     }
 
-    public void setVideos(Set<Video> videos) {
+    public void setVideos(List<Video> videos) {
         this.videos = videos;
     }
+
+    @Override
+    public String toString() {
+        return "Account{" +
+                "id=" + id +
+                ", username='" + username + '\'' +
+                ", password='" + password + '\'' +
+                ", videos=" + videos +
+                '}';
+    }
 }
diff --git a/src/main/java/com/tresmigos/fullstackvideo/model/Comment.java b/src/main/java/com/tresmigos/fullstackvideo/model/Comment.java
new file mode 100644
index 00000000..a4a8f018
--- /dev/null
+++ b/src/main/java/com/tresmigos/fullstackvideo/model/Comment.java
@@ -0,0 +1,56 @@
+package com.tresmigos.fullstackvideo.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import java.util.Date;
+
+
+@Entity
+public class Comment {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long commentId;
+
+    private String text;
+    private Date datePosted;
+
+
+
+
+
+    public Comment() {
+    }
+
+    public Comment(Long commentId, String text, Date datePosted) {
+        this.commentId = commentId;
+        this.text = text;
+        this.datePosted = datePosted;
+    }
+
+    public Long getCommentId() {
+        return commentId;
+    }
+
+    public void setCommentId(Long commentId) {
+        this.commentId = commentId;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public Date getDatePosted() {
+        return datePosted;
+    }
+
+    public void setDatePosted(Date datePosted) {
+        this.datePosted = datePosted;
+    }
+}
diff --git a/src/main/java/com/tresmigos/fullstackvideo/model/Video.java b/src/main/java/com/tresmigos/fullstackvideo/model/Video.java
index fdce5590..c7f5d54d 100644
--- a/src/main/java/com/tresmigos/fullstackvideo/model/Video.java
+++ b/src/main/java/com/tresmigos/fullstackvideo/model/Video.java
@@ -1,69 +1,77 @@
 package com.tresmigos.fullstackvideo.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
 import javax.persistence.*;
+import com.tresmigos.fullstackvideo.model.Account;
+
 
 @Entity
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
 public class Video {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "VIDEO_ID")
+    //@Column(name = "VIDEO_ID")
     private Long id;
 
-    @Column(name = "ACCOUNT_ID")
-    private Integer accountId;
     private String name;
     private String genre;
     private String description;
 
-    public Video() { }
-
-    public Video(Long id, String name, Integer accountId, String genre, String description) {
-        this.id = id;
-        this.name = name;
-        this.accountId = accountId;
-        this.genre = genre;
-        this.description = description;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public void setName(String title) {
-        this.name = name;
-    }
-
-    public Integer getAccountId() {
-        return accountId;
-    }
-
-    public void setAccountId(Integer accountId) {
-        this.accountId = accountId;
-    }
-
-    public String getGenre() {
-        return this.genre;
-    }
-
-    public void setGenre(String genre) {
-        this.genre = genre;
-    }
 
-    public String getDescription() {
-        return this.description;
-    }
+    @ManyToOne
+    @JoinColumn(name = "account_id", referencedColumnName = "id")
+    private Account account;
+
+//    public Video() { }
+
+//    public Video(Long id, String name, String genre, String description, Account account) {
+//        this.id = id;
+//        this.name = name;
+//        this.genre = genre;
+//        this.description = description;
+//        this.account = account;
+//    }
+//
+//    public Long getId() {
+//        return id;
+//    }
+//
+//    public void setId(Long id) {
+//        this.id = id;
+//    }
+//
+//    public String getName() {
+//        return this.name;
+//    }
+//
+//    public void setName(String title) {
+//        this.name = name;
+//    }
+//
+//    public void setGenre(String genre){
+//        this.genre=genre;
+//    }
+//
+//    public String getGenre() {
+//        return this.genre;
+//    }
+//
+//    public String getDescription() {
+//        return description;
+//    }
+//
+//    public Video setDescription(String description) {
+//        this.description = description;
+//        return this;
+//    }
 
-    public void setDescription(String description) {
-        this.description = description;
-    }
-    //tried this at 944
 }
diff --git a/src/main/java/com/tresmigos/fullstackvideo/repository/AccountRepository.java b/src/main/java/com/tresmigos/fullstackvideo/repository/AccountRepository.java
index 258810f3..9a26a59f 100644
--- a/src/main/java/com/tresmigos/fullstackvideo/repository/AccountRepository.java
+++ b/src/main/java/com/tresmigos/fullstackvideo/repository/AccountRepository.java
@@ -1,9 +1,10 @@
 package com.tresmigos.fullstackvideo.repository;
 
 import com.tresmigos.fullstackvideo.model.Account;
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface AccountRepository extends CrudRepository<Account,Long> {
+public interface AccountRepository extends JpaRepository<Account,Long> {
 }
diff --git a/src/main/java/com/tresmigos/fullstackvideo/repository/CommentRepository.java b/src/main/java/com/tresmigos/fullstackvideo/repository/CommentRepository.java
new file mode 100644
index 00000000..88d32f55
--- /dev/null
+++ b/src/main/java/com/tresmigos/fullstackvideo/repository/CommentRepository.java
@@ -0,0 +1,10 @@
+package com.tresmigos.fullstackvideo.repository;
+
+import com.tresmigos.fullstackvideo.model.Comment;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CommentRepository extends JpaRepository<Comment, Long> {
+}
diff --git a/src/main/java/com/tresmigos/fullstackvideo/repository/VideoRepository.java b/src/main/java/com/tresmigos/fullstackvideo/repository/VideoRepository.java
index 5a212209..4aecb3fe 100644
--- a/src/main/java/com/tresmigos/fullstackvideo/repository/VideoRepository.java
+++ b/src/main/java/com/tresmigos/fullstackvideo/repository/VideoRepository.java
@@ -1,9 +1,10 @@
 package com.tresmigos.fullstackvideo.repository;
 
 import com.tresmigos.fullstackvideo.model.Video;
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface VideoRepository extends CrudRepository<Video, Long> {
+public interface VideoRepository extends JpaRepository<Video, Long> {
 }
diff --git a/src/main/java/com/tresmigos/fullstackvideo/service/AccountService.java b/src/main/java/com/tresmigos/fullstackvideo/service/AccountService.java
index 027399cf..dfa03c2c 100644
--- a/src/main/java/com/tresmigos/fullstackvideo/service/AccountService.java
+++ b/src/main/java/com/tresmigos/fullstackvideo/service/AccountService.java
@@ -46,6 +46,6 @@ public Account delete(Long id){
     }
 
     public Account delete(Account account){
-        return delete(account.getId());
+        return delete(account.getAccountId());
     }
 }
diff --git a/src/main/java/com/tresmigos/fullstackvideo/service/AwsServiceClient.java b/src/main/java/com/tresmigos/fullstackvideo/service/AwsServiceClient.java
index 5708fb06..6d7bdedd 100644
--- a/src/main/java/com/tresmigos/fullstackvideo/service/AwsServiceClient.java
+++ b/src/main/java/com/tresmigos/fullstackvideo/service/AwsServiceClient.java
@@ -24,7 +24,8 @@ public class AwsServiceClient {
 
     private AmazonDynamoDBClientBuilder builder = AmazonDynamoDBClientBuilder.standard();
 
-    private BasicAWSCredentials awsCreds = new BasicAWSCredentials("", "");
+    private BasicAWSCredentials awsCreds = new BasicAWSCredentials
+            ("AKIAYTOCM7274XKEZVGV", "/hz3hkBUVC5wzFBwoue3ToBBinudaVh+NV8OQdYp");
     private AmazonS3 s3Client = AmazonS3ClientBuilder.standard()
             .withRegion(Regions.US_EAST_1)
             .withCredentials(new AWSStaticCredentialsProvider(awsCreds))
diff --git a/src/main/java/com/tresmigos/fullstackvideo/service/CommentService.java b/src/main/java/com/tresmigos/fullstackvideo/service/CommentService.java
new file mode 100644
index 00000000..6e9550d7
--- /dev/null
+++ b/src/main/java/com/tresmigos/fullstackvideo/service/CommentService.java
@@ -0,0 +1,45 @@
+package com.tresmigos.fullstackvideo.service;
+
+import com.tresmigos.fullstackvideo.model.Comment;
+import com.tresmigos.fullstackvideo.repository.CommentRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class CommentService {
+
+    @Autowired
+    private CommentRepository repo;
+
+    public Comment create(Comment comment){
+        return repo.save(comment);
+    }
+
+    public Comment read(Long id){
+        return repo.findById(id).orElse(null);
+    }
+    public List<Comment> readAll(){
+        Iterable<Comment> commentIterable = repo.findAll();
+        List<Comment> result = new ArrayList<>();
+        commentIterable.forEach(result :: add);
+        return  result;
+    }
+
+    public Comment update(Long id, Comment newComment){
+        Comment commentInDb = read(id);
+        return  repo.save(commentInDb);
+    }
+
+    public Comment delete(Long id){
+        Comment comment = read(id);
+        repo.deleteById(id);
+        return comment;
+    }
+
+    public Comment delete(Comment comment){
+        return delete(comment.getCommentId());
+    }
+}
diff --git a/src/main/java/com/tresmigos/fullstackvideo/service/VideoService.java b/src/main/java/com/tresmigos/fullstackvideo/service/VideoService.java
index abf0359b..56aef5f1 100644
--- a/src/main/java/com/tresmigos/fullstackvideo/service/VideoService.java
+++ b/src/main/java/com/tresmigos/fullstackvideo/service/VideoService.java
@@ -33,14 +33,15 @@ public List<Video> readAll(){
         return result;
     }
 
-    public Video update(Long id, Video newVideoData){
-        Video original = repo.findById(id).get();
-        original.setName(newVideoData.getName());
-        original.setAccountId(newVideoData.getAccountId());
-        original.setGenre(newVideoData.getGenre());
-        original.setDescription(newVideoData.getDescription());
-        return repo.save(original);
-    }
+//    public Video update(Long id, Video newVideoData){
+//        Video original = repo.findById(id).get();
+//        original.setName(newVideoData.getName());
+//        original.setGenre(newVideoData.getGenre());
+//        original.setDescription(newVideoData.getDescription());
+//        original.setDatePosted(newVideoData.getDatePosted());
+//        original.setVideoURL(newVideoData.getVideoURL());
+//        return repo.save(original);
+//    }
 
     public Video delete(Long id){
         Video deleted = repo.findById(id).get();
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 7a9892b7..a4358083 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,12 @@
 server.port=8080
-spring.datasource.url=jdbc:h2:mem:testdb
-spring.h2.console.enabled=true
-spring.h2.console.view=/h2-console
-spring.servlet.multipart.max-file-size=50MB
\ No newline at end of file
+spring.datasource.url=jdbc:mysql://tresmigosdb11.c1c1lcpeqybm.us-east-1.rds.amazonaws.com/TestTable11
+spring.datasource.username=admin
+spring.datasource.password=abcd1234
+#spring.h2.console.enabled=true
+#spring.h2.console.view=/h2-console
+spring.jpa.show-sql=true
+#spring.jpa.properties.hibernate.dialect=
+#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+#spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
+spring.servlet.multipart.max-file-size=50MB
+spring.jpa.hibernate.ddl-auto=create-drop
\ No newline at end of file
diff --git a/src/test/java/com/tresmigos/fullstackvideo/controller/AccountControllerTest.java b/src/test/java/com/tresmigos/fullstackvideo/controller/AccountControllerTest.java
new file mode 100644
index 00000000..05f40c9d
--- /dev/null
+++ b/src/test/java/com/tresmigos/fullstackvideo/controller/AccountControllerTest.java
@@ -0,0 +1,107 @@
+package com.tresmigos.fullstackvideo.controller;
+
+import com.google.gson.Gson;
+import com.tresmigos.fullstackvideo.model.Account;
+import com.tresmigos.fullstackvideo.model.Comment;
+import com.tresmigos.fullstackvideo.service.AccountService;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+public class AccountControllerTest {
+    @Autowired
+    MockMvc mockMvc;
+
+    @InjectMocks
+    AccountController accountController;
+
+    @Mock
+    AccountService service;
+
+    private Gson gson;
+
+    AccountControllerTest() {
+    }
+
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mockMvc = MockMvcBuilders.standaloneSetup(accountController).build();
+        gson = new Gson();
+
+    }
+
+    @Test
+    void read() throws Exception {
+
+        Account account = new Account();
+
+        Mockito.doReturn(account).when(service).read(Mockito.anyLong());
+
+        mockMvc.perform(get("/account/read{id}",5L)).andExpect(status().isOk());
+    }
+
+    @Test
+    void readAll() throws Exception {
+
+        List<Comment> accountList = new ArrayList<>();
+
+        Mockito.doReturn(accountList).when(service).readAll();
+
+        mockMvc.perform(get("/account/readAll",5L)).andExpect(status().isOk());
+
+    }
+
+    @Test
+    void create() throws Exception {
+
+        Account account = new Account();
+
+        Mockito.doReturn(account).when(service).create(account);
+
+        mockMvc.perform(post("/account/create")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(gson.toJson(account)))
+                .andExpect(status().isCreated());
+    }
+
+    @Test
+    void updateTest() throws Exception {
+
+        Account account = new Account();
+
+        Mockito.when(service.update(5L, account)).thenReturn(account);
+
+
+        mockMvc.perform(put("/account/update/{id}",5L)
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(gson.toJson(account)))
+                .andExpect(status().isOk());
+    }
+
+    @Test
+    void deleteTest() throws Exception {
+
+        Account account = new Account();
+//
+        Mockito.doReturn(account).when(service).delete(Mockito.anyLong());
+
+        mockMvc.perform(delete("/account/delete/{id}", 5L))
+                .andExpect(status().isOk());
+
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/tresmigos/fullstackvideo/controller/CommentControllerTest.java b/src/test/java/com/tresmigos/fullstackvideo/controller/CommentControllerTest.java
new file mode 100644
index 00000000..d6229b63
--- /dev/null
+++ b/src/test/java/com/tresmigos/fullstackvideo/controller/CommentControllerTest.java
@@ -0,0 +1,106 @@
+package com.tresmigos.fullstackvideo.controller;
+
+
+import com.tresmigos.fullstackvideo.model.Comment;
+import com.tresmigos.fullstackvideo.service.CommentService;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import com.google.gson.Gson;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+public class CommentControllerTest {
+    @Autowired
+    MockMvc mockMvc;
+
+    @InjectMocks
+    CommentController commentController;
+
+    @Mock
+    CommentService service;
+
+    private Gson gson;
+
+    CommentControllerTest() {
+    }
+
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mockMvc = MockMvcBuilders.standaloneSetup(commentController).build();
+        gson = new Gson();
+
+    }
+
+    @Test
+    void read() throws Exception {
+
+        Comment comment = new Comment();
+
+        Mockito.doReturn(comment).when(service).read(Mockito.anyLong());
+
+        mockMvc.perform(get("/comment/{id}",5L)).andExpect(status().isOk());
+    }
+
+    @Test
+    void readAll() throws Exception {
+
+        List<Comment> commentList = new ArrayList<>();
+
+        Mockito.doReturn(commentList).when(service).readAll();
+
+        mockMvc.perform(get("/comment/allComment",5L)).andExpect(status().isOk());
+
+    }
+
+    @Test
+    void create() throws Exception {
+
+        Comment comment = new Comment();
+
+        Mockito.doReturn(comment).when(service).create(comment);
+
+        mockMvc.perform(post("/comment/")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(gson.toJson(comment)))
+                .andExpect(status().isCreated());
+    }
+
+    @Test
+    void updateTest() throws Exception {
+
+        Comment comment = new Comment();
+
+        Mockito.when(service.update(5L, comment)).thenReturn(comment);
+
+
+        mockMvc.perform(put("/comment/update/{id}",5L)
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(gson.toJson(comment)))
+                .andExpect(status().isOk());
+    }
+
+    @Test
+    void deleteTest() throws Exception {
+
+        Comment comment = new Comment();
+//
+        Mockito.doReturn(comment).when(service).delete(Mockito.anyLong());
+
+        mockMvc.perform(delete("/comment/delete/{id}", 5L))
+                .andExpect(status().isOk());
+
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/tresmigos/fullstackvideo/controller/VideoControllerTest.java b/src/test/java/com/tresmigos/fullstackvideo/controller/VideoControllerTest.java
index 5469e805..baf35cb4 100644
--- a/src/test/java/com/tresmigos/fullstackvideo/controller/VideoControllerTest.java
+++ b/src/test/java/com/tresmigos/fullstackvideo/controller/VideoControllerTest.java
@@ -1,8 +1,6 @@
 package com.tresmigos.fullstackvideo.controller;
 
-import com.amazonaws.services.s3.model.ObjectListing;
 import com.tresmigos.fullstackvideo.model.Video;
-import com.tresmigos.fullstackvideo.service.AwsServiceClient;
 import com.tresmigos.fullstackvideo.service.VideoService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -10,72 +8,117 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import java.util.List;
-import java.util.Optional;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.when;
+//import static org.mockito.ArgumentMatchers.anyLong;
 
 class VideoControllerTest {
+    @Autowired
+    MockMvc mockMvc;
+
     @InjectMocks
     VideoController videoController;
 
     @Mock
     VideoService service;
-    @Mock
-    AwsServiceClient awsServiceClient;
 
+
+    private List<Video> videoList;
     @BeforeEach
     void setUp() {
         MockitoAnnotations.initMocks(this);
-    }
-
+        mockMvc = MockMvcBuilders.standaloneSetup(videoController).build();
 
-    @Test
-    void read() {
-        //given
-        Video video=new Video();
-        ResponseEntity<Video>expected=new ResponseEntity<>(video,HttpStatus.OK);
-        //when
-        Mockito.doReturn(video).when(service).read(Mockito.anyLong());
-        ResponseEntity<Video>actual=videoController.read(Mockito.anyLong());
-        //then
-        assertEquals(expected,actual);
     }
 
     @Test
-    void updateVideoById() {
+    void read() throws Exception {
         //given
         Video video = new Video();
         ResponseEntity<Video> expected = new ResponseEntity<>(video,HttpStatus.OK);
 
         //when
-        Mockito.when(service.update(5L, video)).thenReturn(video);
-
-        ResponseEntity<Video> actual = videoController.updateVideoById(5L,video);
+        Mockito.doReturn(video).when(service).read(Mockito.anyLong());
 
-        //Then
-        assertEquals(expected,actual);
+        //then
+        mockMvc.perform(get("/video/getVideo/{id}",5L)).andExpect(status().isOk());
     }
 
-    @Test
-    void deleteVideoById() {
-        //given
-        Video video = new Video();
-        ResponseEntity<Video> expected = new ResponseEntity<>(video,HttpStatus.OK);
-
-        //when
-        Mockito.doReturn(video).when(service).delete(Mockito.anyLong());
-        ResponseEntity<Video> actual = videoController.deleteVideoById(Mockito.anyLong());
-
-        //Then
-        assertEquals(expected,actual);
-    }
+//    @Test
+//    void readAll() throws Exception {
+//        //given
+//        List<Video> videoList = new ArrayList<>();
+//        ResponseEntity<List<Video>> expected = new ResponseEntity<>(videoList,HttpStatus.OK);
+//
+//        //when
+//        Mockito.doReturn(videoList).when(service).readAll();
+//        //then
+//        mockMvc.perform(get("/video/all",5L)).andExpect(status().isOk());
+//
+//    }
+
+//    @Test
+//    void create() throws Exception {
+//        //given
+//        Account account = new Account();
+//        ResponseEntity<Account> expected = new ResponseEntity<>(account,HttpStatus.CREATED);
+//
+//        //when
+//        Mockito.doReturn(account).when(service).create(account);
+//
+////        //Then
+////        assertEquals(expected,actual);
+//        mockMvc.perform(post("/create",5L)).andExpect(status().isOk());
+//
+//    }
+//
+//    @Test
+//    void updateTest() {
+//        //given
+//        Account account = new Account();
+//        ResponseEntity<Account> expected = new ResponseEntity<>(account,HttpStatus.OK);
+//
+//        //when
+//        Mockito.when(service.update(5L, account)).thenReturn(account);
+//
+//        ResponseEntity<Account> actual = accountController.update(5L,account);
+//
+//        //Then
+//        assertEquals(expected,actual);
+//    }
+//
+//    @Test
+//    void delete() {
+//        //given
+//        Account account = new Account();
+//        ResponseEntity<Account> expected = new ResponseEntity<>(account,HttpStatus.OK);
+//
+//        //when
+//        Mockito.doReturn(account).when(service).delete(Mockito.anyLong());
+//        ResponseEntity<Account> actual = accountController.delete(Mockito.anyLong());
+//
+//        //Then
+//        assertEquals(expected,actual);
+//    }
+@Test
+void deleteTest() throws Exception {
+
+    Video video = new Video();
+//
+    Mockito.doReturn(video).when(service).delete(Mockito.anyLong());
+
+    mockMvc.perform(delete("/video/delete/{id}", 5L))
+            .andExpect(status().isOk());
+
+}
 }
\ No newline at end of file
diff --git a/src/test/java/com/tresmigos/fullstackvideo/model/AccountTest.java b/src/test/java/com/tresmigos/fullstackvideo/model/AccountTest.java
new file mode 100644
index 00000000..ab458328
--- /dev/null
+++ b/src/test/java/com/tresmigos/fullstackvideo/model/AccountTest.java
@@ -0,0 +1,75 @@
+package com.tresmigos.fullstackvideo.model;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class AccountTest {
+
+    @InjectMocks
+    Account account;
+
+    @Mock
+    Video video;
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    void getId() {
+        //given
+        Long expectedId=5L;
+        account.setAccountId(5L);
+        //when
+        Long actual=account.getAccountId();
+        //then
+        assertEquals(expectedId,actual);
+    }
+
+    @Test
+    void getUsername() {
+        //given
+        String expected="Mark";
+        account.setUsername(expected);
+        //when
+        String actual=account.getUsername();
+        //then
+        assertEquals(expected,actual);
+    }
+
+    @Test
+    void getPassword() {
+        //given
+        String expected="finland";
+        account.setPassword(expected);
+        //when
+        String actual=account.getPassword();
+        //then
+        assertEquals(expected,actual);
+    }
+//    @Test
+//    void getVideos() {
+//        //given
+//        Video v1=new Video();
+//        Video v2=new Video();
+//        List<Video> expected = new ArrayList<>();
+//        expected.add(v1);
+//        expected.add(v2);
+//        account.setVideos(expected);
+//
+//        //when
+//        List<Video> actual=account.getVideos();
+//        //then
+//        assertEquals(expected,actual);
+//    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/tresmigos/fullstackvideo/model/CommentTest.java b/src/test/java/com/tresmigos/fullstackvideo/model/CommentTest.java
new file mode 100644
index 00000000..99eaa1b8
--- /dev/null
+++ b/src/test/java/com/tresmigos/fullstackvideo/model/CommentTest.java
@@ -0,0 +1,53 @@
+package com.tresmigos.fullstackvideo.model;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Date;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class CommentTest {
+    @InjectMocks
+    Comment comment;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    void getCommentId() {
+        //given
+        Long expectedId=5L;
+        comment.setCommentId(5L);
+        //when
+        Long actual= comment.getCommentId();
+        //then
+        assertEquals(expectedId,actual);
+    }
+
+    @Test
+    void getText() {
+        //given
+        String expected="great video";
+        comment.setText(expected);
+        //when
+        String actual=comment.getText();
+        //then
+        assertEquals(expected,actual);
+    }
+
+    @Test
+    void getDatePosted() throws IllegalArgumentException{
+        //given
+        Date expected=new Date();
+        comment.setDatePosted(expected);
+        //when
+        Date actual=comment.getDatePosted();
+        //then
+        assertEquals(expected,actual);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/tresmigos/fullstackvideo/model/VideoTest.java b/src/test/java/com/tresmigos/fullstackvideo/model/VideoTest.java
index 1fae863c..2e362e1f 100644
--- a/src/test/java/com/tresmigos/fullstackvideo/model/VideoTest.java
+++ b/src/test/java/com/tresmigos/fullstackvideo/model/VideoTest.java
@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.MockitoAnnotations;
-import sun.jvm.hotspot.utilities.Assert;
+
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.BeforeEach;
@@ -25,60 +25,58 @@ void setUp() {
         MockitoAnnotations.initMocks(this);
     }
 
-    @Test
-    void getId() {
-        //given
-        Long expectedId=5L;
-        video.setId(5L);
-        //when
-        Long actual=video.getId();
-        //then
-        System.out.println(actual);
-        assertEquals(expectedId,actual);
-    }
-
-    @Test
-    void getName() {
-        //given
-        String expectedName="Indian";
-        video.setName(expectedName);
-        //when
-        String actual=video.getName();
-        //then
-        //assertNull(actual);
-        assertNull(actual);
-    }
-
-    @Test
-    void getAccountId() {
-        //given
-        Integer expectedAccId=54;
-        video.setAccountId(expectedAccId);
-        //when
-        Integer actual=video.getAccountId();
-        //then
-        assertEquals(expectedAccId,actual);
-    }
-
-    @Test
-    void getGenre() {
-        //given
-        String expectedGenre="Indian";
-        video.setGenre(expectedGenre);
-        //when
-        String actual=video.getGenre();
-        //then
-        assertEquals(expectedGenre,actual);
-    }
-
-    @Test
-    void getDescription() {
-        //given
-        String expectedDesc="Classical Music";
-        video.setName(expectedDesc);
-        //when
-        String actual=video.getDescription();
-        //then
-        assertNull(actual);
-    }
+//    @Test
+//    void getId() {
+//        //given
+//        Long expectedId=5L;
+//        video.setId(5L);
+//        //when
+//        Long actual=video.getId();
+//        //then
+//        assertEquals(expectedId,actual);
+//    }
+//
+//    @Test
+//    void getName() {
+//        //given
+//        String expectedName="Indian";
+//        video.setGenre(expectedName);
+//        //when
+//        String actual=video.getGenre();
+//        //then
+//        assertNull(actual);
+//    }
+//
+////    @Test
+////    void getAccountId() {
+////        //given
+////        Integer expectedAccId=54;
+////        video.setAccountId(expectedAccId);
+////        //when
+////        Integer actual=video.getAccountId();
+////        //then
+////        assertEquals(expectedAccId,actual);
+////    }
+//
+//    @Test
+//    void getGenre() {
+//        //given
+//        String expectedGenre="Indian";
+//        video.setGenre(expectedGenre);
+//        //when
+//        String actual=video.getGenre();
+//        //then
+//        assertEquals(expectedGenre,actual);
+//    }
+//
+//    @Test
+//    void getDescription() {
+//        //given
+//        String expectedDesc="Classical Music";
+//        video.setDescription(expectedDesc);
+//        //when
+//        String actual=video.getDescription();
+//        //then
+//        assertNull(actual);
+//    }
 }
\ No newline at end of file
diff --git a/src/test/java/com/tresmigos/fullstackvideo/service/AccountServiceTest.java b/src/test/java/com/tresmigos/fullstackvideo/service/AccountServiceTest.java
new file mode 100644
index 00000000..ba0fc272
--- /dev/null
+++ b/src/test/java/com/tresmigos/fullstackvideo/service/AccountServiceTest.java
@@ -0,0 +1,109 @@
+package com.tresmigos.fullstackvideo.service;
+
+import com.tresmigos.fullstackvideo.model.Account;
+import com.tresmigos.fullstackvideo.repository.AccountRepository;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.when;
+
+class AccountServiceTest {
+    @InjectMocks
+    AccountService accountService;
+
+    @Mock
+    AccountRepository repository;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    void create() {
+        //given
+        Account account=new Account();
+        Account expected=new Account();
+        //when
+        Mockito.doReturn(expected).when(repository).save(account);
+        Account actual=accountService.create(account);
+        //then
+        assertEquals(expected,actual);
+    }
+
+    @Test
+    void read() {
+        //given
+        List<Long> id = new ArrayList<>();
+        Account account = new Account();
+        Account expected = new Account();
+
+        //when
+        when(repository.findById(anyLong())).thenReturn(Optional.of(expected));
+        Account Actual =accountService.read(anyLong());
+
+        //Then
+        assertEquals(expected,Actual);
+    }
+
+    @Test
+    void readAll() {
+        //given
+        Account account = new Account();
+        List<Account> result = new ArrayList<>();
+        result.add(new Account());
+        List expected = new ArrayList();
+
+        //when
+        Mockito.doReturn(expected).when(repository).findAll();
+        List Actual = accountService.readAll();
+
+        //Then
+        assertEquals(expected,Actual);
+    }
+
+    @Test
+    void update() {
+        //given
+        List<Long> id = new ArrayList<>();
+        id.add(5L);
+        id.add(6L);
+        Account account = new Account();
+        account.setAccountId(5L);
+        account.setUsername("Mark");
+        account.setPassword("Finland");
+
+
+        //when
+        when(repository.findById(anyLong())).thenReturn(Optional.of(account));
+        when(repository.save(account)).thenReturn(account);
+
+        Account actual = accountService.update(anyLong(),account);
+
+        //Then
+        assertEquals(account,actual);
+    }
+
+    @Test
+    void delete() {
+        //given
+        Account account = new Account();
+
+        //when
+        Mockito.when(repository.findById(2L)).thenReturn(Optional.of(account));
+        Account actual = accountService.delete(2L);
+
+        //Then
+        assertEquals(account,actual);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/tresmigos/fullstackvideo/service/CommentServiceTest.java b/src/test/java/com/tresmigos/fullstackvideo/service/CommentServiceTest.java
new file mode 100644
index 00000000..0a53eefa
--- /dev/null
+++ b/src/test/java/com/tresmigos/fullstackvideo/service/CommentServiceTest.java
@@ -0,0 +1,123 @@
+package com.tresmigos.fullstackvideo.service;
+
+import com.tresmigos.fullstackvideo.model.Comment;
+import com.tresmigos.fullstackvideo.repository.CommentRepository;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.when;
+
+class CommentServiceTest {
+
+    @InjectMocks
+    CommentService commentService;
+
+    @Mock
+    CommentRepository repository;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    void create() {
+        //given
+        Comment comment=new Comment();
+        Comment expected=new Comment();
+        //when
+        Mockito.doReturn(expected).when(repository).save(comment);
+        Comment actual=commentService.create(comment);
+        //then
+        assertEquals(expected,actual);
+    }
+
+    @Test
+    void read() {
+        //given
+        List<Long> id = new ArrayList<>();
+        Comment comment = new Comment();
+        Comment expected = new Comment();
+
+        //when
+        when(repository.findById(anyLong())).thenReturn(Optional.of(expected));
+        Comment actual =commentService.read(anyLong());
+
+        //Then
+        assertEquals(expected,actual);
+    }
+
+    @Test
+    void readAll() {
+        //given
+        Comment comment = new Comment();
+        List<Comment> result = new ArrayList<>();
+        result.add(new Comment());
+        List expected = new ArrayList();
+
+        //when
+        Mockito.doReturn(expected).when(repository).findAll();
+        List Actual = commentService.readAll();
+
+        //Then
+        assertEquals(expected,Actual);
+    }
+
+    @Test
+    void update() {
+        //given
+        List<Long> id = new ArrayList<>();
+        id.add(5L);
+        id.add(6L);
+        Comment comment = new Comment();
+        comment.setText("good video");
+        comment.setDatePosted(new Date());
+
+
+        //when
+        when(repository.findById(anyLong())).thenReturn(Optional.of(comment));
+        when(repository.save(comment)).thenReturn(comment);
+
+        Comment actual = commentService.update(anyLong(),comment);
+
+        //Then
+        assertEquals(comment,actual);
+    }
+
+    @Test
+    void delete() {
+        //given
+        Comment comment = new Comment();
+
+        //when
+        Mockito.when(repository.findById(2L)).thenReturn(Optional.of(comment));
+        Comment actual = commentService.delete(2L);
+
+        //Then
+        assertEquals(comment,actual);
+    }
+
+    @Test
+    void testDelete() {
+        //given
+        Comment comment = new Comment();
+
+        //when
+        Mockito.when(repository.findById(4L)).thenReturn(Optional.of(comment));
+        Comment actual = commentService.delete(4L);
+
+        //Then
+        assertEquals(comment,actual);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/tresmigos/fullstackvideo/service/VideoServiceTest.java b/src/test/java/com/tresmigos/fullstackvideo/service/VideoServiceTest.java
index 66ad4e10..eda8a54d 100644
--- a/src/test/java/com/tresmigos/fullstackvideo/service/VideoServiceTest.java
+++ b/src/test/java/com/tresmigos/fullstackvideo/service/VideoServiceTest.java
@@ -8,11 +8,13 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.anyLong;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Matchers.anyLong;
 import static org.mockito.Mockito.when;
 
 class VideoServiceTest {
@@ -64,7 +66,7 @@ void read() {
 
         //when
         when(repository.findById(anyLong())).thenReturn(Optional.of(expected));
-        Video Actual =videoService.read(Mockito.anyLong());
+        Video Actual =videoService.read(anyLong());
 
         //Then
         assertEquals(expected,Actual);
@@ -72,27 +74,27 @@ void read() {
     }
 
 
-    @Test
-    void update() {
-        //given
-        List<Long> id = new ArrayList<>();
-        id.add(5L);
-        id.add(6L);
-        Video video = new Video();
-        video.setGenre("rock");
-        video.setDescription("latest rock songs");
-        video.setAccountId(5);
-
-
-        //when
-        when(repository.findById(anyLong())).thenReturn(Optional.of(video));
-        when(repository.save(video)).thenReturn(video);
-
-        Video Actual = videoService.update(Mockito.anyLong(),video);
-
-        //Then
-        assertEquals(video,Actual);
-    }
+//    @Test
+//    void update() {
+//        //given
+//        List<Long> id = new ArrayList<>();
+//        id.add(5L);
+//        id.add(6L);
+//        Video video = new Video();
+//        video.setGenre("rock");
+//        video.setDescription("latest rock songs");
+////        video.setAccountId(5);
+//
+//
+//        //when
+//        when(repository.findById(anyLong())).thenReturn(Optional.of(video));
+//        when(repository.save(video)).thenReturn(video);
+//
+//        Video Actual = videoService.update(Mockito.anyLong(),video);
+//
+//        //Then
+//        assertEquals(video,Actual);
+//    }
 
     @Test
     void delete() {