diff --git a/pom.xml b/pom.xml
index ed84c9b..55f5e1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,18 @@
     <groupId>io.zipcoder</groupId>
     <artifactId>spring-demo</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
new file mode 100644
index 0000000..18b98c7
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
@@ -0,0 +1,73 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+import io.zipcoder.tc_spring_poll_application.domain.*;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.http.*;
+import javax.validation.Valid;
+import java.net.URI;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+
+@RestController
+public class PollController {
+   private PollRepository pollRepository;
+
+
+   @Autowired
+    public PollController(PollRepository pollRepository) {
+        this.pollRepository = pollRepository;
+    }
+
+    @RequestMapping(value = "/polls", method = RequestMethod.GET)
+    public ResponseEntity<Iterable<Poll>> getAllPolls(Pageable P) {
+        Iterable<Poll> allPolls = pollRepository.findAll((Iterable<Long>) P);
+        return new ResponseEntity<>(allPolls, HttpStatus.OK);
+    }
+
+    @RequestMapping(value="/polls", method=RequestMethod.POST)
+    public ResponseEntity<?> createPoll(@RequestBody @Valid Poll poll) {
+        poll = pollRepository.save(poll);
+        URI newPollUri = ServletUriComponentsBuilder
+                .fromCurrentRequest().path("/{id}")
+                .buildAndExpand(poll.getId()).toUri();
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setLocation(newPollUri);
+        return new ResponseEntity<>(null, HttpStatus.CREATED);
+    }
+
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.GET)
+    public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
+        Poll p = pollRepository.findOne(pollId);
+        return new ResponseEntity<> (p, HttpStatus.OK);
+    }
+
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
+    public ResponseEntity<?> updatePoll(@RequestBody @Valid Poll poll, @PathVariable Long pollId) {
+        // Save the entity
+        Poll p = pollRepository.save(poll);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.DELETE)
+    public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
+        pollRepository.delete(pollId);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    public void verifyPoll(Long pollId){
+        if(!pollRepository.exists(pollId)) {
+            throw new ResourceNotFoundException();
+        }
+    }
+
+
+
+
+
+
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
new file mode 100644
index 0000000..77c77d5
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
@@ -0,0 +1,45 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
+import org.springframework.beans.factory.annotation.*;
+import org.springframework.http.ResponseEntity;
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import org.springframework.http.HttpStatus;
+
+
+    @RestController
+    public class VoteController {
+
+        private VoteRepository voteRepository;
+
+        @Autowired
+        public VoteController(VoteRepository voteRepository) {
+            this.voteRepository = voteRepository;
+        }
+
+        @RequestMapping(value = "/polls/{pollId}/votes", method = RequestMethod.POST)
+        public ResponseEntity<?> createVote(@PathVariable Long pollId, @RequestBody Vote
+                vote) {
+            vote = voteRepository.save(vote);
+            // Set the headers for the newly created resource
+            HttpHeaders responseHeaders = new HttpHeaders();
+            responseHeaders.setLocation(ServletUriComponentsBuilder.
+                    fromCurrentRequest().path("/{id}").buildAndExpand(vote.getId()).toUri());
+            return new ResponseEntity<>(null, responseHeaders, HttpStatus.CREATED);
+        }
+
+        @RequestMapping(value="/polls/votes", method=RequestMethod.GET)
+        public Iterable<Vote> getAllVotes() {
+            return voteRepository.findAll();
+        }
+
+        @RequestMapping(value="/polls/{pollId}/votes", method=RequestMethod.GET)
+        public Iterable<Vote> getVote(@PathVariable Long pollId) {
+            return voteRepository.findById(pollId);
+        }
+
+    }
+
+
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java
new file mode 100644
index 0000000..ab0f8ab
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java
@@ -0,0 +1,31 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.*;
+
+@Entity
+public class Option {
+
+    @Id
+    @GeneratedValue
+    @Column(name = "OPTION_ID")
+    private Long id;
+
+    @Column(name = "OPTION_VALUE")
+    private String value;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
new file mode 100644
index 0000000..10d8d45
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
@@ -0,0 +1,48 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.*;
+import java.util.Set;
+import javax.validation.constraints.*;
+import org.hibernate.validator.constraints.NotEmpty;
+
+@Entity
+public class Poll {
+    @Id
+    @GeneratedValue
+    @Column(name = "POLL_ID")
+    private Long id;
+
+    @Column(name = "QUESTION")
+    @NotEmpty
+    private String question;
+
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "POLL_ID")
+    @OrderBy
+    @Size(min=2, max = 6)
+    private Set<Option> options;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getQuestion() {
+        return question;
+    }
+
+    public void setQuestion(String question) {
+        this.question = question;
+    }
+
+    public Set<Option> getOptions() {
+        return options;
+    }
+
+    public void setOptions(Set<Option> options) {
+        this.options = options;
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java
new file mode 100644
index 0000000..88b3903
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java
@@ -0,0 +1,32 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.*;
+
+
+@Entity
+public class Vote {
+    @Id
+    @GeneratedValue
+    @Column(name = "VOTE_ID")
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "OPTION_ID")
+    private Option option;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public io.zipcoder.tc_spring_poll_application.domain.Option getOption() {
+        return option;
+    }
+
+    public void setOption(io.zipcoder.tc_spring_poll_application.domain.Option option) {
+        this.option = option;
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/ComputeResultController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/ComputeResultController.java
new file mode 100644
index 0000000..ff98926
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/ComputeResultController.java
@@ -0,0 +1,45 @@
+package io.zipcoder.tc_spring_poll_application.dtos;
+import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.http.ResponseEntity;
+import io.zipcoder.tc_spring_poll_application.domain.*;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
+import java.util.ArrayList;
+
+@RestController
+public class ComputeResultController {
+    @Autowired
+    private VoteRepository voteRepository;
+
+    private PollRepository pollRepository;
+
+
+    public ComputeResultController(VoteRepository voteRepository) {
+        this.voteRepository = voteRepository;
+    }
+
+    @RequestMapping(value = "/computeresult", method = RequestMethod.GET)
+    public ResponseEntity<?> computeResult(@RequestParam Long pollId) {
+        VoteResult voteResult = new VoteResult();
+        Iterable<Vote> allVotes = voteRepository.findVotesByPoll(pollId);
+        io.zipcoder.tc_spring_poll_application.domain.Poll poll = pollRepository.findOne(pollId);
+        voteResult.setResults(new java.util.ArrayList<OptionCount>());
+        for (Option o : poll.getOptions()) {
+            OptionCount optionCount = new OptionCount();
+            optionCount.setOptionId(o.getId());
+            optionCount.setCount(Math.toIntExact(((ArrayList<Vote>) allVotes).stream().filter(v -> v.getOption().equals(o)).count()));
+            voteResult.getResults().add(optionCount);
+        }
+
+        return new ResponseEntity<VoteResult>(voteResult, HttpStatus.OK);
+    }
+
+
+
+
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/OptionCount.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/OptionCount.java
new file mode 100644
index 0000000..f30c159
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/OptionCount.java
@@ -0,0 +1,23 @@
+package io.zipcoder.tc_spring_poll_application.dtos;
+
+public class OptionCount {
+    private Long optionId;
+    private int count;
+
+
+    public Long getOptionId() {
+        return optionId;
+    }
+
+    public void setOptionId(Long optionId) {
+        this.optionId = optionId;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java
new file mode 100644
index 0000000..37d9a01
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java
@@ -0,0 +1,25 @@
+package io.zipcoder.tc_spring_poll_application.dtos;
+import java.util.Collection;
+
+public class VoteResult {
+
+    private int totalVotes;
+    private Collection<OptionCount> results;
+
+    public int getTotalVotes() {
+        return totalVotes;
+    }
+
+    public void setTotalVotes(int totalVotes) {
+        this.totalVotes = totalVotes;
+    }
+
+    public Collection<OptionCount> getResults() {
+        return results;
+    }
+
+    public void setResults(Collection<OptionCount> results) {
+        this.results = results;
+    }
+
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java
new file mode 100644
index 0000000..9c2450f
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java
@@ -0,0 +1,61 @@
+package io.zipcoder.tc_spring_poll_application.error;
+import java.util.*;
+import java.net.*;
+
+public class ErrorDetail {
+
+    private String title;
+    private int status;
+    private String detail;
+    private Long timeStamp;
+    private String developerMessage;
+
+    Map<String, List<ValidationError>> errors;
+
+    public String getTitle() { return title; }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    public Long getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(Long timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public String getDeveloperMessage() {
+        return developerMessage;
+    }
+
+    public void setDeveloperMessage(String developerMessage) {
+        this.developerMessage = developerMessage;
+    }
+
+
+    public Map<String, List<ValidationError>> getErrors() {
+        return errors;
+    }
+
+    public void setErrors(Map<String, List<ValidationError>> errors) {
+        this.errors = errors;
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/error/ValidationError.java b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ValidationError.java
new file mode 100644
index 0000000..59fd6af
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ValidationError.java
@@ -0,0 +1,24 @@
+package io.zipcoder.tc_spring_poll_application.error;
+
+public class ValidationError {
+
+    private String code;
+    private String message;
+
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
new file mode 100644
index 0000000..543b080
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
@@ -0,0 +1,47 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.http.HttpStatus;
+
+
+@ResponseStatus(HttpStatus.NOT_FOUND)
+public class ResourceNotFoundException extends RuntimeException {
+    /**
+     * Constructs a new runtime exception with {@code null} as its
+     * detail message.  The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     */
+    public ResourceNotFoundException() {
+    }
+
+    /**
+     * Constructs a new runtime exception with the specified detail message and
+     * cause.  <p>Note that the detail message associated with
+     * {@code cause} is <i>not</i> automatically incorporated in
+     * this runtime exception's detail message.
+     *
+     * @param message the detail message (which is saved for later retrieval
+     *                by the {@link #getMessage()} method).
+     * @param cause   the cause (which is saved for later retrieval by the
+     *                {@link #getCause()} method).  (A <tt>null</tt> value is
+     *                permitted, and indicates that the cause is nonexistent or
+     *                unknown.)
+     * @since 1.4
+     */
+    public ResourceNotFoundException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Constructs a new runtime exception with the specified detail message.
+     * The cause is not initialized, and may subsequently be initialized by a
+     * call to {@link #initCause}.
+     *
+     * @param message the detail message. The detail message is saved for
+     *                later retrieval by the {@link #getMessage()} method.
+     */
+    public ResourceNotFoundException(String message) {
+        super(message);
+    }
+
+
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java
new file mode 100644
index 0000000..10a7b4b
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java
@@ -0,0 +1,63 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.http.*;
+import io.zipcoder.tc_spring_poll_application.error.*;
+import java.util.*;
+import java.io.*;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.context.MessageSource;
+import org.springframework.validation.*;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@ControllerAdvice
+public class RestExceptionHandler {
+    @Autowired
+    private MessageSource messageSource;
+
+    @ExceptionHandler(ResourceNotFoundException.class)
+    public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request) {
+        ErrorDetail detail = new ErrorDetail();
+        detail.setTimeStamp(new Date().getTime());
+        detail.setDetail(rnfe.getMessage());
+
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        rnfe.printStackTrace(pw);
+        detail.setDeveloperMessage(sw.toString());
+
+        detail.setTitle("Resource Not Found Exception");
+        detail.setStatus(HttpStatus.NOT_FOUND.value());
+        return new ResponseEntity<ErrorDetail>(detail, HttpStatus.NOT_FOUND);}
+
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?>
+    handleValidationError(MethodArgumentNotValidException manve, HttpServletRequest request){
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setTimeStamp(new Date().getTime());
+        errorDetail.setTitle("Resource Validation Failed");
+        errorDetail.setStatus(HttpStatus.BAD_REQUEST.value());
+        errorDetail.setDetail(manve.getMessage());
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        manve.printStackTrace(pw);
+        errorDetail.setDeveloperMessage(sw.toString());
+
+        List<FieldError> fieldErrors =  manve.getBindingResult().getFieldErrors();
+        for(FieldError fe : fieldErrors) {
+
+            List<ValidationError> validationErrorList = errorDetail.getErrors().get(fe.getField());
+            if(validationErrorList == null) {
+                validationErrorList = new ArrayList<>();
+                errorDetail.getErrors().put(fe.getField(), validationErrorList);
+            }
+            ValidationError validationError = new ValidationError();
+            validationError.setCode(fe.getCode());
+            validationError.setMessage(messageSource.getMessage(fe, null));
+            validationErrorList.add(validationError);
+        }
+      return new ResponseEntity<ErrorDetail>(errorDetail, HttpStatus.BAD_REQUEST);
+    }
+
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
new file mode 100644
index 0000000..5a5e31c
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
@@ -0,0 +1,8 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+import org.springframework.data.repository.CrudRepository;
+import io.zipcoder.tc_spring_poll_application.domain.Option;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface OptionRepository extends CrudRepository<Option, Long> {
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
new file mode 100644
index 0000000..2e32254
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
@@ -0,0 +1,8 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+import org.springframework.data.repository.CrudRepository;
+import io.zipcoder.tc_spring_poll_application.domain.Poll;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PollRepository extends CrudRepository<Poll, Long>{
+}
\ No newline at end of file
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
new file mode 100644
index 0000000..ee47063
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
@@ -0,0 +1,18 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+import org.springframework.data.repository.CrudRepository;
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.stereotype.Repository;
+import org.springframework.data.jpa.repository.Query;
+
+@Repository
+public interface VoteRepository extends CrudRepository<Vote, Long> {
+    @Query(value = "SELECT v.* " +
+            "FROM Option o, Vote v " +
+            "WHERE o.POLL_ID = ?1 " +
+            "AND v.OPTION_ID = o.OPTION_ID", nativeQuery = true)
+    public Iterable<Vote> findVotesByPoll(Long pollId);
+
+    Iterable<Vote> findById(Long pollId);
+}
+
+
diff --git a/src/main/resources/import.sql b/src/main/resources/import.sql
new file mode 100644
index 0000000..736bc4b
--- /dev/null
+++ b/src/main/resources/import.sql
@@ -0,0 +1,40 @@
+insert into poll (poll_id, question) values (1, 'What is your favorite color?');
+insert into option (option_id, option_value, poll_id) values (1, 'Red', 1);
+insert into option (option_id, option_value, poll_id) values (2, 'Orange', 2);
+insert into option (option_id, option_value, poll_id) values (3, 'Blue', 3);
+
+insert into poll (poll_id, question) values (1, 'What is your favorite Netflix Original?');
+insert into option (option_id, option_value, poll_id) values (4, 'Orange is the New Black', 4);
+insert into option (option_id, option_value, poll_id) values (5, 'Stranger things', 5);
+insert into option (option_id, option_value, poll_id) values (6, 'The Get Down', 6);
+
+
+insert into poll (poll_id, question) values (1, 'What is your favorite Book?');
+insert into option (option_id, option_value, poll_id) values (7, 'Gifted Hands', 7);
+insert into option (option_id, option_value, poll_id) values (8, 'You Have A Brain', 8);
+insert into option (option_id, option_value, poll_id) values (9, 'A More Perfect Union', 9);
+
+
+insert into poll (poll_id, question) values (1, 'What is your favorite Surgeon?');
+insert into option (option_id, option_value, poll_id) values (10, 'Ben Carson', 10);
+insert into option (option_id, option_value, poll_id) values (11, 'Miranda Bailey', 11);
+insert into option (option_id, option_value, poll_id) values (12, 'Maggie Pierce', 12);
+
+
+insert into poll (poll_id, question) values (1, 'What is your favorite TV Show?');
+insert into option (option_id, option_value, poll_id) values (13, 'Greys Anatomy', 13);
+insert into option (option_id, option_value, poll_id) values (14, 'The Good Doctor', 14);
+insert into option (option_id, option_value, poll_id) values (15, 'The Resident', 15);
+
+
+insert into poll (poll_id, question) values (1, 'What is your favorite Store?');
+insert into option (option_id, option_value, poll_id) values (16, 'NY&CO', 16);
+insert into option (option_id, option_value, poll_id) values (17, 'KOHLS', 17);
+insert into option (option_id, option_value, poll_id) values (18, 'ROSS', 18);
+
+
+insert into poll (poll_id, question) values (1, 'What is your favorite Author?');
+insert into option (option_id, option_value, poll_id) values (19, 'Ben Carson', 19);
+insert into option (option_id, option_value, poll_id) values (20, 'Donald Trump', 20);
+insert into option (option_id, option_value, poll_id) values (21, 'Ronald Reagan', 21);
+
diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
new file mode 100644
index 0000000..3f51f36
--- /dev/null
+++ b/src/main/resources/messages.properties
@@ -0,0 +1,2 @@
+NotEmpty.poll.question=Question is a required field
+Size.poll.options=Options must be greater than {2} and less than {1}
\ No newline at end of file