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/ComputeResultController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
new file mode 100644
index 0000000..77a9dd5
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
@@ -0,0 +1,45 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+import io.zipcoder.tc_spring_poll_application.domain.Option;
+import io.zipcoder.tc_spring_poll_application.domain.Poll;
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import io.zipcoder.tc_spring_poll_application.dtos.OptionCount;
+import io.zipcoder.tc_spring_poll_application.dtos.VoteResult;
+import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
+import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+
+@RestController
+public class ComputeResultController {
+    private VoteRepository voteRepository;
+    private PollRepository pollRepository;
+
+    @Autowired
+    public ComputeResultController(VoteRepository voteRepository, PollRepository pollRepository){
+        this.voteRepository = voteRepository;
+        this.pollRepository = pollRepository;
+    }
+
+    @GetMapping(value = "/computeresult")
+    public ResponseEntity<?> computeResult(@RequestParam Long pollId) {
+        VoteResult voteResult = new VoteResult();
+        Iterable<Vote> allVotes = voteRepository.findVotesByPoll(pollId);
+
+        Poll poll = pollRepository.findOne(pollId);
+        voteResult.setResults(new 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);
+    }
+}
\ No newline at end of file
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..fe64eab
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
@@ -0,0 +1,71 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+import io.zipcoder.tc_spring_poll_application.domain.Poll;
+import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
+import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Page;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+
+import javax.validation.Valid;
+import java.net.URI;
+
+@RestController
+public class PollController {
+    public PollRepository pollRepository;
+
+    @Autowired
+    public PollController(PollRepository pollRepository){
+        this.pollRepository = pollRepository;
+    }
+
+    @GetMapping(value="/polls")
+    public ResponseEntity<Iterable<Poll>> getAllPolls(Pageable P) {
+        Page<Poll> allPolls = pollRepository.findAll(P);
+        return new ResponseEntity<>(allPolls, HttpStatus.OK);
+    }
+
+    @PostMapping(value="/polls")
+    public ResponseEntity<?> createPoll(@RequestBody @Valid Poll poll) {
+        poll = pollRepository.save(poll);
+        URI newPollUri = ServletUriComponentsBuilder
+                .fromCurrentRequest()
+                .path("/{id}")
+                .buildAndExpand(poll.getId())
+                .toUri();
+        HttpHeaders hh = new HttpHeaders();
+        hh.setLocation(newPollUri);
+        return new ResponseEntity<>(hh, HttpStatus.CREATED);
+    }
+
+    @GetMapping(value="/polls/{pollId}")
+    public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
+        Poll p = pollRepository.findOne(pollId);
+        return new ResponseEntity<> (p, HttpStatus.OK);
+    }
+
+    @PutMapping(value="/polls/{pollId}")
+    public ResponseEntity<?> updatePoll(@RequestBody @Valid Poll poll, @PathVariable Long pollId) {
+        // Save the entity
+        Poll p = pollRepository.save(poll);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @DeleteMapping(value="/polls/{pollId}")
+    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..d3603a8
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
@@ -0,0 +1,42 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+
+@RestController
+public class VoteController {
+    private VoteRepository voteRepository;
+
+    @Autowired
+    public VoteController(VoteRepository voteRepository) {
+        this.voteRepository = voteRepository;
+    }
+
+    @PostMapping("/polls/{pollId}/votes")
+    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);
+    }
+
+    @GetMapping(value="/polls/votes")
+    public Iterable<Vote> getAllVotes() {
+        return voteRepository.findAll();
+    }
+
+    @GetMapping(value="/polls/{pollId}/votes")
+    public Iterable<Vote> getVote(@PathVariable Long pollId) {
+        return voteRepository.findVotesByPoll(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..55556b2
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java
@@ -0,0 +1,33 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class Option {
+    @Id
+    @GeneratedValue
+    @Column(name = "OPTION_ID")
+    public Long id;
+
+    @Column(name = "OPTION_VALUE")
+    public 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..3c768c6
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
@@ -0,0 +1,50 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.persistence.*;
+import javax.validation.constraints.Size;
+import java.util.Set;
+
+@Entity
+public class Poll {
+    @Id
+    @GeneratedValue
+    @Column(name = "POLL_ID")
+    public Long id;
+
+    @Column(name = "QUESTION")
+    @NotEmpty
+    public String question;
+
+
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "POLL_ID")
+    @OrderBy
+    @Size(min=2, max = 6)
+    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..c801044
--- /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")
+    public Long id;
+
+
+    @ManyToOne
+    @JoinColumn(name = "OPTION_ID")
+    public Option option;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Option getOption() {
+        return option;
+    }
+
+    public void setOption(Option option) {
+        this.option = option;
+    }
+}
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..7f289b4
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/OptionCount.java
@@ -0,0 +1,22 @@
+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..cac527f
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java
@@ -0,0 +1,24 @@
+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;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/error/ErrorDetail.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/error/ErrorDetail.java
new file mode 100644
index 0000000..5edc642
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/error/ErrorDetail.java
@@ -0,0 +1,61 @@
+package io.zipcoder.tc_spring_poll_application.dtos.error;
+
+import java.util.List;
+import java.util.Map;
+
+public class ErrorDetail {
+    private String title;
+    private int status;
+    private String detail;
+    private long timeStamp;
+    private String developerMessage;
+    private 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/dtos/error/ValidationError.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/error/ValidationError.java
new file mode 100644
index 0000000..4513ad0
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/error/ValidationError.java
@@ -0,0 +1,23 @@
+package io.zipcoder.tc_spring_poll_application.dtos.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..95cf612
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
@@ -0,0 +1,17 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.NOT_FOUND)
+public class ResourceNotFoundException extends RuntimeException {
+    public ResourceNotFoundException(){}
+
+    public ResourceNotFoundException(String message){
+        super(message);
+    }
+
+    public ResourceNotFoundException(String message, Throwable cause){
+        super(message, cause);
+    }
+}
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..8c3d7ed
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java
@@ -0,0 +1,71 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+
+import io.zipcoder.tc_spring_poll_application.dtos.error.ErrorDetail;
+import io.zipcoder.tc_spring_poll_application.dtos.error.ValidationError;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.MessageSource;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import sun.plugin2.message.Message;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@ControllerAdvice
+public class RestExceptionHandler {
+    @Autowired
+    MessageSource messageSource;
+
+    @ExceptionHandler(ResourceNotFoundException.class)
+    public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request) {
+        ErrorDetail ed = new ErrorDetail();
+        ed.setTimeStamp(new Date().getTime());
+        ed.setDetail(rnfe.getMessage());
+
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        rnfe.printStackTrace(pw);
+        ed.setDeveloperMessage(sw.toString());
+        ed.setTitle("Resource Not Found Exception");
+        ed.setStatus(HttpStatus.NOT_FOUND.value());
+
+        return new ResponseEntity<ErrorDetail>(ed, HttpStatus.NOT_FOUND);
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?> handleValidationError(MethodArgumentNotValidException manve,
+                                                   HttpServletRequest request) {
+        ErrorDetail ed = new ErrorDetail();
+        ed.setTimeStamp(new Date().getTime());
+        ed.setTitle("Resource Validation Failed");
+        ed.setStatus(HttpStatus.BAD_REQUEST.value());
+        ed.setDetail(manve.getMessage());
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        manve.printStackTrace(pw);
+        ed.setDeveloperMessage(sw.toString());
+
+        List<FieldError> fieldErrors = manve.getBindingResult().getFieldErrors();
+        for (FieldError fe : fieldErrors) {
+
+            List<ValidationError> validationErrorList = ed.getErrors().get(fe.getField());
+            if (validationErrorList == null) {
+                validationErrorList = new ArrayList<>();
+                ed.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>(ed, 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..925d2f1
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
@@ -0,0 +1,9 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Option;
+import org.springframework.data.repository.CrudRepository;
+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..d5af6ac
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
@@ -0,0 +1,12 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Poll;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+
+@Repository
+public interface PollRepository extends PagingAndSortingRepository<Poll, Long> {
+    //PagingAndSortingRepository extends CrudRepository<Poll, Long>
+}
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..2bbce0e
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
@@ -0,0 +1,13 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+
+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);
+}
diff --git a/src/main/resources/import.sql b/src/main/resources/import.sql
new file mode 100644
index 0000000..b01bf22
--- /dev/null
+++ b/src/main/resources/import.sql
@@ -0,0 +1,81 @@
+insert into poll (poll_id, question) values (1, 'What is your favorite color?');
+insert into option (option_id, option_value, poll_id) values (1, 'Yellow', 1);
+insert into option (option_id, option_value, poll_id) values (2, 'Red', 1);
+insert into option (option_id, option_value, poll_id) values (3, 'Blue', 1);
+
+insert into poll (poll_id, question) values (2, 'What is your favorite food?');
+insert into option (option_id, option_value, poll_id) values (4, 'Sushi', 2);
+insert into option (option_id, option_value, poll_id) values (5, 'Tacos', 2);
+insert into option (option_id, option_value, poll_id) values (6, 'Fries', 2);
+
+insert into poll (poll_id, question) values (3, 'What is your favorite season?');
+insert into option (option_id, option_value, poll_id) values (7, 'Autumn', 3);
+insert into option (option_id, option_value, poll_id) values (8, 'Spring', 3);
+insert into option (option_id, option_value, poll_id) values (9, 'Winter', 3);
+insert into option (option_id, option_value, poll_id) values (10, 'Summer', 3);
+
+insert into poll (poll_id, question) values (4, 'What is your favorite drink?');
+insert into option (option_id, option_value, poll_id) values (11, 'Vodka', 4);
+insert into option (option_id, option_value, poll_id) values (12, 'Rum', 4);
+insert into option (option_id, option_value, poll_id) values (13, 'Brandy', 4);
+
+insert into poll (poll_id, question) values (5, 'What is your favorite tree?');
+insert into option (option_id, option_value, poll_id) values (14, 'Birch', 5);
+insert into option (option_id, option_value, poll_id) values (15, 'Maple', 5);
+insert into option (option_id, option_value, poll_id) values (16, 'Oak', 5);
+
+insert into poll (poll_id, question) values (6, 'What is your favorite movie?');
+insert into option (option_id, option_value, poll_id) values (17, 'Corpse Bride', 6);
+insert into option (option_id, option_value, poll_id) values (18, 'Clerks', 6);
+insert into option (option_id, option_value, poll_id) values (19, 'Fast and Furious', 6);
+
+insert into poll (poll_id, question) values (7, 'What is your favorite car?');
+insert into option (option_id, option_value, poll_id) values (20, 'Tesla', 7);
+insert into option (option_id, option_value, poll_id) values (21, 'Toyota', 7);
+insert into option (option_id, option_value, poll_id) values (22, 'Honda', 7);
+
+insert into poll (poll_id, question) values (8, 'What is your favorite candy?');
+insert into option (option_id, option_value, poll_id) values (23, 'Skittles', 8);
+insert into option (option_id, option_value, poll_id) values (24, 'Sour Patch', 8);
+insert into option (option_id, option_value, poll_id) values (25, 'Chocolate', 8);
+
+insert into poll (poll_id, question) values (9, 'What is your favorite number?');
+insert into option (option_id, option_value, poll_id) values (26, 'One', 9);
+insert into option (option_id, option_value, poll_id) values (27, 'Two', 9);
+insert into option (option_id, option_value, poll_id) values (28, 'Three', 9);
+
+insert into poll (poll_id, question) values (10, 'What is your favorite animal?');
+insert into option (option_id, option_value, poll_id) values (29, 'Dog', 10);
+insert into option (option_id, option_value, poll_id) values (30, 'Cat', 10);
+insert into option (option_id, option_value, poll_id) values (31, 'Bear', 10);
+
+insert into poll (poll_id, question) values (11, 'What is your favorite sport?');
+insert into option (option_id, option_value, poll_id) values (32, 'Cycling', 11);
+insert into option (option_id, option_value, poll_id) values (33, 'Basketball', 11);
+insert into option (option_id, option_value, poll_id) values (34, 'Soccer', 11);
+
+insert into poll (poll_id, question) values (12, 'What is your favorite game?');
+insert into option (option_id, option_value, poll_id) values (35, 'Final Fantasy', 12);
+insert into option (option_id, option_value, poll_id) values (36, 'Call of Duty', 12);
+insert into option (option_id, option_value, poll_id) values (37, 'Skyrim', 12);
+
+insert into poll (poll_id, question) values (13, 'What is your favorite desert?');
+insert into option (option_id, option_value, poll_id) values (38, 'Ice cream', 13);
+insert into option (option_id, option_value, poll_id) values (39, 'Chocolate cake', 13);
+insert into option (option_id, option_value, poll_id) values (40, 'Mochi', 13);
+
+insert into poll (poll_id, question) values (14, 'What is your favorite day of the week?');
+insert into option (option_id, option_value, poll_id) values (41, 'Monday', 14);
+insert into option (option_id, option_value, poll_id) values (42, 'Tuesday', 14);
+insert into option (option_id, option_value, poll_id) values (43, 'Wednesday', 14);
+insert into option (option_id, option_value, poll_id) values (44, 'Thursday', 14);
+insert into option (option_id, option_value, poll_id) values (45, 'Friday', 14);
+insert into option (option_id, option_value, poll_id) values (46, 'Saturday', 14);
+insert into option (option_id, option_value, poll_id) values (47, 'Sunday', 14);
+
+insert into poll (poll_id, question) values (15, 'What is your favorite instructor?');
+insert into option (option_id, option_value, poll_id) values (48, 'Froilan', 15);
+insert into option (option_id, option_value, poll_id) values (49, 'Dolio', 15);
+insert into option (option_id, option_value, poll_id) values (50, 'Chris', 15);
+insert into option (option_id, option_value, poll_id) values (51, 'Roberto', 15);
+insert into option (option_id, option_value, poll_id) values (52, 'Kris', 15);
\ No newline at end of file
diff --git a/src/main/resources/message.properties b/src/main/resources/message.properties
new file mode 100644
index 0000000..3f51f36
--- /dev/null
+++ b/src/main/resources/message.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