diff --git a/pom.xml b/pom.xml
index ed84c9b..1b6e6cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,10 +7,22 @@
     <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>
-        <version>1.5.3.RELEASE</version>
+        <version>2.1.2.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <properties>
diff --git a/src/main/java/dtos/OptionCount.java b/src/main/java/dtos/OptionCount.java
new file mode 100644
index 0000000..8180316
--- /dev/null
+++ b/src/main/java/dtos/OptionCount.java
@@ -0,0 +1,28 @@
+package dtos;
+
+public class OptionCount {
+
+    private Long optionId;
+    private int count;
+
+    public OptionCount(Long optionId, int count) {
+        this.optionId = optionId;
+        this.count = 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/dtos/VoteResult.java b/src/main/java/dtos/VoteResult.java
new file mode 100644
index 0000000..04a0e7b
--- /dev/null
+++ b/src/main/java/dtos/VoteResult.java
@@ -0,0 +1,30 @@
+package dtos;
+
+import java.util.Collection;
+
+public class VoteResult {
+
+    private int totalVotes;
+    private Collection<OptionCount> results;
+
+    public VoteResult(int totalVotes, Collection<OptionCount> results) {
+        this.totalVotes = totalVotes;
+        this.results = 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/controller/ComputeResultController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
new file mode 100644
index 0000000..e04b383
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
@@ -0,0 +1,63 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+import dtos.OptionCount;
+import dtos.VoteResult;
+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.repositories.OptionRepository;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+@RestController
+public class ComputeResultController {
+    private VoteRepository voteRepository;
+
+    @Autowired
+    public ComputeResultController(VoteRepository voteRepository) {
+        this.voteRepository = voteRepository;
+    }
+
+    @GetMapping("/computeresult")
+    public ResponseEntity<?> computeResult(@RequestParam Long pollId) {
+        List <OptionCount> optionsCountList = new ArrayList<>();
+        Map<Long, Long> optionCounts;
+        Iterable<Vote> allVotes;
+
+        allVotes = voteRepository.findVotesByPoll(pollId);
+        optionCounts= StreamSupport.stream(allVotes.spliterator(), false)
+                .collect(Collectors.groupingBy(v -> v.getOption().getId(), Collectors.counting()));
+        ArrayList<Long> keys = new ArrayList<Long>(optionCounts.keySet());
+        for (int i = 0; i < optionCounts.size(); i++) {
+             optionsCountList.add(new OptionCount(keys.get(i), optionCounts.get(keys.get(i)).intValue()));
+        }
+
+        VoteResult voteResult = new VoteResult(countAllVotes(allVotes), optionsCountList);
+            //TODO: Implement algorithm to count votes
+            return new ResponseEntity<VoteResult>(voteResult, HttpStatus.OK);
+        }
+
+    public Integer countAllVotes (Iterable<Vote> allVotes){
+        Long count = StreamSupport.stream(allVotes.spliterator(), false).count();
+        return count.intValue();
+        }
+
+}
+
+
+
+
+
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..9e25547
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
@@ -0,0 +1,76 @@
+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.boot.autoconfigure.data.web.SpringDataWebProperties;
+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 org.springframework.data.domain.Pageable;
+import javax.validation.Valid;
+
+import java.net.URI;
+
+@RestController
+public class PollController {
+
+    private PollRepository pollRepository;
+
+    @Autowired
+    public PollController(PollRepository pollRepository){
+        this.pollRepository = pollRepository;
+    }
+
+    @GetMapping("/polls")
+    public ResponseEntity<Iterable<Poll>> getAllPolls(Pageable pageable) {
+        Page<Poll> allPolls = pollRepository.findAll(pageable);
+        return new ResponseEntity<>(allPolls, HttpStatus.OK);
+    }
+
+    @PostMapping("/polls")
+    public ResponseEntity<?> createPoll(@RequestBody @Valid Poll poll) {
+        pollRepository.save(poll);
+        URI newPollUri = ServletUriComponentsBuilder
+                .fromCurrentRequest()
+                .path("/{id}")
+                .buildAndExpand(poll.getId())
+                .toUri();
+        HttpHeaders header = new HttpHeaders();
+        header.setLocation(newPollUri);
+        return new ResponseEntity<>(header, HttpStatus.CREATED);
+    }
+
+    @GetMapping("/polls/{pollId}")
+    public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
+        if (pollRepository.findById(pollId).isPresent()) {
+            Poll p = pollRepository.findById(pollId).get();
+            return new ResponseEntity<>(p, HttpStatus.OK);
+        }
+        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+    }
+
+    @PutMapping("/polls/{pollId}")
+    public ResponseEntity<?> updatePoll(@RequestBody @Valid Poll poll, @PathVariable Long pollId) {
+        // Save the entity
+        verifyPoll(pollId);
+        Poll p = pollRepository.save(poll);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @DeleteMapping("/polls/{pollId}")
+    public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
+        verifyPoll(pollId);
+        pollRepository.deleteById(pollId);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    public void verifyPoll (Long pollId) throws ResourceNotFoundException {
+        if(!pollRepository.findById(pollId).isPresent()) 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..7d51aab
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
@@ -0,0 +1,41 @@
+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.stereotype.Controller;
+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("/polls/{pollId}/votes")
+    public ResponseEntity<Iterable<Vote>> getVote(@PathVariable Long pollId) {
+        return new ResponseEntity<>(voteRepository.findVotesByPoll(pollId), HttpStatus.OK);
+    }
+}
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..bfead6e
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java
@@ -0,0 +1,44 @@
+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")
+    Long id;
+
+    @Column(name = "OPTION_VALUE")
+    String value;
+
+    public Option () {}
+
+    public Option(Long id, String value) {
+        this.id = id;
+        this.value = value;
+    }
+
+    public Option(String value) {
+        this.value = 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..511c200
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
@@ -0,0 +1,64 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+import java.util.Set;
+
+@Entity
+public class Poll {
+
+    @Id
+    @GeneratedValue
+    @Column(name = "POLL_ID")
+    Long id;
+
+    @Column(name = "QUESTION")
+    @NotEmpty
+    String question;
+
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "POLL_ID")
+    @OrderBy
+    @Size(min = 2, max = 6)
+    Set<Option> options;
+
+    public Poll () {}
+
+    public Poll(Long id, String question, Set<Option> options) {
+        this.id = id;
+        this.question = question;
+        this.options = options;
+    }
+
+    public Poll(String question, Set<Option> options) {
+        this.question = question;
+        this.options = 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..f17dd4b
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java
@@ -0,0 +1,42 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.*;
+
+@Entity
+public class Vote {
+    @Id
+    @GeneratedValue
+    @Column(name = "VOTE_ID")
+    Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "OPTION_ID")
+    Option option;
+
+    public Vote () {}
+
+    public Vote(Long id, Option option) {
+        this.id = id;
+        this.option = option;
+    }
+
+    public Vote(Option option) {
+        this.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/error/ErrorDetail.java b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java
new file mode 100644
index 0000000..f5b124a
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java
@@ -0,0 +1,71 @@
+package io.zipcoder.tc_spring_poll_application.error;
+
+import javax.validation.Validation;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+public class ErrorDetail {
+    String title;   //a brief title of the error condition, eg: "Validation Failure" or "Internal Server Error"
+    Integer status; //the HTTP status code for the current request; redundant but useful for client-side error handling
+    String detail;  //A short, human-readable description of the error that may be presented to a user
+    long timeStamp;  //the time in milliseconds when the error occurred
+    String developerMessage;  //detailed information such as exception class name or a stack trace useful for developers to debug
+    Map<String, List<ValidationError>> errors;
+
+    public ErrorDetail(String title, Integer status, String detail, long timeStamp, String developerMessage) {
+        this.title = title;
+        this.status = status;
+        this.detail = detail;
+        this.timeStamp = timeStamp;
+        this.developerMessage = developerMessage;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer 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/RestExceptionHandler.java b/src/main/java/io/zipcoder/tc_spring_poll_application/error/RestExceptionHandler.java
new file mode 100644
index 0000000..7e0c585
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/error/RestExceptionHandler.java
@@ -0,0 +1,60 @@
+package io.zipcoder.tc_spring_poll_application.error;
+
+import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
+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 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) {
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        rnfe.printStackTrace(pw);
+        ErrorDetail myErrorDetail = new ErrorDetail("Resource Not Found Exception", HttpStatus.NOT_FOUND.value(), rnfe.getMessage(), new Date().getTime(), sw.toString());
+        return new ResponseEntity<>(myErrorDetail, HttpStatus.NOT_FOUND);
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?> handleValidationError(  MethodArgumentNotValidException manve, HttpServletRequest request){
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        manve.printStackTrace(pw);
+        ErrorDetail errorDetail = new ErrorDetail("Method Argument Not Valid Exception", HttpStatus.BAD_REQUEST.value(), manve.getMessage(), new Date().getTime(), 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, HttpStatus.BAD_REQUEST);
+    }
+
+}
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..bafda5d
--- /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 {
+
+    String code;
+    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..ae5991b
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
@@ -0,0 +1,21 @@
+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/repositories/OptionRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
new file mode 100644
index 0000000..9791e63
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
@@ -0,0 +1,10 @@
+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..7bcb2ab
--- /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> {
+
+
+}
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..ab3df50
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
@@ -0,0 +1,23 @@
+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;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface VoteRepository extends CrudRepository <Vote, Long> {
+
+    /*
+    The custom finder method findVotesByPoll takes the ID of the Poll as its parameter.
+    The @Query annotation on this method takes a native SQL query along with the nativeQuery flag set to true.
+    At runtime, Spring Data JPA replaces the ?1 placeholder with the passed-in pollId parameter value.
+     */
+
+    @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/resource/import.sql b/src/main/resource/import.sql
new file mode 100644
index 0000000..1d2b721
--- /dev/null
+++ b/src/main/resource/import.sql
@@ -0,0 +1,30 @@
+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, 'Blue', 1);
+insert into option (option_id, option_value, poll_id) values (3, 'Green', 1);
+insert into option (option_id, option_value, poll_id) values (4, 'Yellow', 1);
+
+insert into poll (poll_id, question) values (2, 'What is your favorite car color?');
+insert into option (option_id, option_value, poll_id) values (5, 'Red Car', 2);
+insert into option (option_id, option_value, poll_id) values (6, 'Blue Car', 2);
+insert into option (option_id, option_value, poll_id) values (7, 'Green Car', 2);
+insert into option (option_id, option_value, poll_id) values (8, 'Yellow Car', 2);
+
+
+insert into poll (poll_id, question) values (3, 'What is your toilet size?');
+insert into option (option_id, option_value, poll_id) values (9, 'L', 3);
+insert into option (option_id, option_value, poll_id) values (10, 'XL', 3);
+insert into option (option_id, option_value, poll_id) values (11, 'SM', 3);
+insert into option (option_id, option_value, poll_id) values (12, 'MED', 3);
+
+insert into poll (poll_id, question) values (4, 'What is your favorite food?');
+insert into option (option_id, option_value, poll_id) values (13, 'Chinese', 4);
+insert into option (option_id, option_value, poll_id) values (14, 'Sushi', 4);
+insert into option (option_id, option_value, poll_id) values (15, 'Italian', 4);
+insert into option (option_id, option_value, poll_id) values (16, 'Mexican', 4);
+
+insert into poll (poll_id, question) values (5, 'What is your favorite football team?');
+insert into option (option_id, option_value, poll_id) values (17, 'Red', 5);
+insert into option (option_id, option_value, poll_id) values (18, 'Blue', 5);
+insert into option (option_id, option_value, poll_id) values (19, 'Green', 5);
+insert into option (option_id, option_value, poll_id) values (20, 'Yellow', 5);
\ No newline at end of file
diff --git a/src/main/resource/messages.properties b/src/main/resource/messages.properties
new file mode 100644
index 0000000..3f51f36
--- /dev/null
+++ b/src/main/resource/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