diff --git a/pom.xml b/pom.xml
index ed84c9b..fab15cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <start-class>io.zipcoder.tc_spring_poll_application.QuickPollApplication</start-class>
+        <start-class>io.zipcoder.springdemo.QuickPollApplication</start-class>
         <java.version>1.7</java.version>
     </properties>
     <dependencies>
diff --git a/src/main/java/dtos/OptionCount.java b/src/main/java/dtos/OptionCount.java
new file mode 100644
index 0000000..cdf9522
--- /dev/null
+++ b/src/main/java/dtos/OptionCount.java
@@ -0,0 +1,22 @@
+package 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/dtos/VoteResult.java b/src/main/java/dtos/VoteResult.java
new file mode 100644
index 0000000..b3d873d
--- /dev/null
+++ b/src/main/java/dtos/VoteResult.java
@@ -0,0 +1,24 @@
+package 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/controller/ComputeResultController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
new file mode 100644
index 0000000..385ebc5
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
@@ -0,0 +1,51 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+import dtos.OptionCount;
+import dtos.VoteResult;
+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.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+public class ComputeResultController {
+
+    private VoteRepository voteRepository;
+
+    @Autowired
+    public  ComputeResultController(VoteRepository voteRepository){
+        this.voteRepository = voteRepository;
+    }
+
+    @RequestMapping(value = "/computeresult", method = RequestMethod.GET)
+    public ResponseEntity<?> computeResult(@RequestParam Long pollId){ //requestparam annotation instructs SPring to retrieve the pollId value from a HTTP query
+        VoteResult voteResult = new VoteResult();
+        Iterable<Vote> allVotes = voteRepository.findVotesByPoll(pollId);
+
+        int totalVotes = 0;
+        Map<Long, OptionCount> tempMap = new HashMap<>();
+        for(Vote v : allVotes) {
+            totalVotes ++;
+            // Get the OptionCount corresponding to this Option
+            OptionCount optionCount = tempMap.get(v.getOption().getId());
+            if(optionCount == null) {
+                optionCount = new OptionCount();
+                optionCount.setOptionId(v.getOption().getId());
+                tempMap.put(v.getOption().getId(), optionCount);
+            }
+            optionCount.setCount(optionCount.getCount()+1);
+        }
+        voteResult.setTotalVotes(totalVotes);
+        voteResult.setResults(tempMap.values());
+
+        return new ResponseEntity<>(voteResult, HttpStatus.OK); //computes results sent to client using new response entity
+    }
+}
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..0b0ad2d
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
@@ -0,0 +1,79 @@
+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.Page;
+import org.springframework.data.domain.Pageable;
+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// marks entity as a controller following REST specs
+public class PollController {
+
+    private PollRepository pollRepository;
+
+    @Autowired //The @Autowired annotation allows you to skip configurations elsewhere of what to inject and just does it for you
+    public PollController(PollRepository pollRepository){
+        this.pollRepository = pollRepository;
+    }
+
+    @RequestMapping(value="/polls", method= RequestMethod.GET)//maps web requests to entities with the @RequestMapping
+    public ResponseEntity<Page<Poll>> getAllPolls(Pageable pageable) {
+        Page<Poll> allPolls = pollRepository.findAll(pageable); //essentially pages the data
+        return new ResponseEntity<>(allPolls, HttpStatus.OK);// returns paged data
+    }
+
+    @RequestMapping(value="/polls", method=RequestMethod.POST)
+    public ResponseEntity<?> createPoll(@RequestBody Poll poll) { //@RequestBody tells Spring that the entire request body needs to be converted to an instance of Poll
+        poll = pollRepository.save(poll);
+        HttpHeaders newHeaders = new HttpHeaders();
+
+        URI newPollUri = ServletUriComponentsBuilder //allows the client to have a way to know the uri of the created poll
+                .fromCurrentRequest()
+                .path("/{id}")
+                .buildAndExpand(poll.getId())
+                .toUri();
+                newHeaders.setLocation(newPollUri);
+        return new ResponseEntity<>(newHeaders, HttpStatus.CREATED);
+    }
+
+    @Valid
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.GET)
+    public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
+        verifyPoll(pollId);
+        Poll p = pollRepository.findOne(pollId);
+        return new ResponseEntity<> (p, HttpStatus.OK);
+    }
+
+    @Valid
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
+    public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId) {
+        // Save the entity
+        verifyPoll(pollId);
+        Poll p = pollRepository.save(poll);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.DELETE)
+    public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
+        verifyPoll(pollId);
+        pollRepository.delete(pollId);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    public void verifyPoll(Long pollId){
+        Poll poll = pollRepository.findOne(pollId);
+        if(poll == null){
+            throw new ResourceNotFoundException("The given poll id " + pollId + " does not exist!");
+        }
+    }
+
+}
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..7a9bb10
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
@@ -0,0 +1,43 @@
+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;
+    }
+
+    @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.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..82ca99d
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java
@@ -0,0 +1,35 @@
+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 // this means that a class can be mapped to a table. Just is a marker like Serializable
+public class Option {
+
+    @Id // specifies primary key of entity (primary key is a special column)
+    @GeneratedValue // configures the way of increment of the specified column (field)
+    @Column(name = "OPTION_ID")// specifies mapped column for a persistence property. Without this annotation the framework assumes the field's variable-name is the persistent property
+    private Long id;
+
+    @Column(name = "OPTION_VALUE")// specifies mapped column for persistence 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..c3e8b3f
--- /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")
+    private Long id;
+
+    @NotEmpty
+    @Column(name = "QUESTION")
+    private String question;
+
+    @Size(min=2, max = 6)
+    @OneToMany(cascade = CascadeType.ALL)// indicates that a Poll instance can contain zero or more Option instances. The CascadeType.All indicates that any database operations such as persist, remove, or merge on a Poll instance needs to be propagated to all related Option instances
+    @JoinColumn(name = "POLL_ID")// indicates this entity is the owner of the relationship. It has a key to the column with options
+    @OrderBy// orders by ASC default
+    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..8c64785
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java
@@ -0,0 +1,31 @@
+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 // indicates tha the option instance can have zero or more Vote instances associated with it
+    @JoinColumn(name = "OPTION_ID")
+    private 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..dba4308
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java
@@ -0,0 +1,62 @@
+package io.zipcoder.tc_spring_poll_application.error;
+
+import java.util.List;
+import java.util.Map;
+
+public class ErrorDetail {
+
+    private String title; // title of error condition
+    private int status; // HTTP status code for current request
+    private String detail; // short readable description of error
+    private long timeStamp; // time in milliseconds when error occurred
+    private String developerMessage; // detailed info as such exception class or trace
+    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/error/ValidationError.java b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ValidationError.java
new file mode 100644
index 0000000..742892c
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ValidationError.java
@@ -0,0 +1,23 @@
+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..88b4a69
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
@@ -0,0 +1,20 @@
+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..37e9e97
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java
@@ -0,0 +1,66 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+
+import io.zipcoder.tc_spring_poll_application.error.ErrorDetail;
+import io.zipcoder.tc_spring_poll_application.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 javax.servlet.http.HttpServletRequest;
+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){
+        //make error detail object and fill it?
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setTitle("Resource Not Found");
+        errorDetail.setStatus(HttpStatus.NOT_FOUND.value());
+        errorDetail.setDetail(rnfe.getMessage());
+        errorDetail.setTimeStamp(new Date().getTime());
+        errorDetail.setDeveloperMessage(rnfe.getClass().getName());
+        return new ResponseEntity<>(errorDetail, null,  HttpStatus.NOT_FOUND);
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?> handleValicationError(MethodArgumentNotValidException manve, HttpServletRequest request){
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setTitle("Validation Failed");
+        errorDetail.setStatus(HttpStatus.BAD_REQUEST.value());
+        errorDetail.setDetail("Input validation failed");
+        errorDetail.setTimeStamp(new Date().getTime());
+        errorDetail.setDeveloperMessage(manve.getClass().getName());
+
+        String requestPath = (String) request.getAttribute("javax.servlet.error. request_uri");
+        if(requestPath == null) {
+            requestPath = request.getRequestURI();
+        }
+
+        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/repositories/OptionRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
new file mode 100644
index 0000000..b6d1cea
--- /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;
+
+public interface OptionRepository extends CrudRepository<Option, Long>{
+    //these are DAOs pr Data Access Objects they provide abstraction for interacting with data stores
+    // ypu have usually one repository per domain object
+}
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..64437f3
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
@@ -0,0 +1,10 @@
+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;
+
+public interface PollRepository extends PagingAndSortingRepository<Poll, Long> {
+    //these are DAOs pr Data Access Objects they provide abstraction for interacting with data stores
+    // ypu have usually one repository per domain object
+}
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..34d8bff
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
@@ -0,0 +1,16 @@
+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> {
+    //these are DAOs pr Data Access Objects they provide abstraction for interacting with data stores
+    // ypu have usually one repository per domain object
+
+    @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..5c5050b
--- /dev/null
+++ b/src/main/resources/import.sql
@@ -0,0 +1,74 @@
+ 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, 'Purple', 1);
+
+ insert into poll (poll_id, question) values (2, 'What is your favorite car brand?');
+ insert into option (option_id, option_value, poll_id) values (4, 'Chevy', 2);
+ insert into option (option_id, option_value, poll_id) values (5, 'Subaru', 2);
+ insert into option (option_id, option_value, poll_id) values (6, 'Honda', 2);
+
+ insert into poll (poll_id, question) values (3, 'What is your favorite warframe?');
+ insert into option (option_id, option_value, poll_id) values (7, 'Saryn', 3);
+ insert into option (option_id, option_value, poll_id) values (8, 'Frost', 3);
+ insert into option (option_id, option_value, poll_id) values (9, 'Titania', 3);
+
+ insert into poll (poll_id, question) values (4, 'What is your favorite book genre?');
+ insert into option (option_id, option_value, poll_id) values (10, 'Sci-Fi', 4);
+ insert into option (option_id, option_value, poll_id) values (11, 'Fantasy', 4);
+ insert into option (option_id, option_value, poll_id) values (12, 'Drama', 4);
+
+ insert into poll (poll_id, question) values (5, 'What is your favorite movie?');
+ insert into option (option_id, option_value, poll_id) values (13, 'Ready Player One', 5);
+ insert into option (option_id, option_value, poll_id) values (14, 'Black Panther', 5);
+ insert into option (option_id, option_value, poll_id) values (15, 'Pacific Rim 2', 5);
+
+ insert into poll (poll_id, question) values (6, 'What is your favorite phone?');
+ insert into option (option_id, option_value, poll_id) values (16, 'Samsung s9', 6);
+ insert into option (option_id, option_value, poll_id) values (17, 'Lg v30', 6);
+ insert into option (option_id, option_value, poll_id) values (18, 'OnePlus 5T', 6);
+
+ insert into poll (poll_id, question) values (7, 'What is your favorite soda?');
+ insert into option (option_id, option_value, poll_id) values (19, 'Dr. Pepper', 7);
+ insert into option (option_id, option_value, poll_id) values (20, 'Coke', 7);
+ insert into option (option_id, option_value, poll_id) values (21, 'Pepsi', 7);
+
+ insert into poll (poll_id, question) values (8, 'What is your favorite console?');
+ insert into option (option_id, option_value, poll_id) values (22, 'PS4', 8);
+ insert into option (option_id, option_value, poll_id) values (23, 'Xbox One', 8);
+ insert into option (option_id, option_value, poll_id) values (24, 'Nintendo Switch', 8);
+
+ insert into poll (poll_id, question) values (9, 'What is your favorite music genre?');
+ insert into option (option_id, option_value, poll_id) values (25, 'Rock', 9);
+ insert into option (option_id, option_value, poll_id) values (26, 'Edm', 9);
+ insert into option (option_id, option_value, poll_id) values (27, 'Pop', 9);
+
+ insert into poll (poll_id, question) values (10, 'What is your favorite pet?');
+ insert into option (option_id, option_value, poll_id) values (28, 'Dog', 10);
+ insert into option (option_id, option_value, poll_id) values (29, 'Cat', 10);
+ insert into option (option_id, option_value, poll_id) values (30, 'Bird', 10);
+
+ insert into poll (poll_id, question) values (11, 'What is your favorite monstercat artist?');
+ insert into option (option_id, option_value, poll_id) values (31, 'Conro', 11);
+ insert into option (option_id, option_value, poll_id) values (32, 'Muzzy', 11);
+ insert into option (option_id, option_value, poll_id) values (33, 'Kuuro', 11);
+
+ insert into poll (poll_id, question) values (12, 'What is your favorite computer brand?');
+ insert into option (option_id, option_value, poll_id) values (34, 'HP', 12);
+ insert into option (option_id, option_value, poll_id) values (35, 'Apple', 12);
+ insert into option (option_id, option_value, poll_id) values (36, 'Purple', 12);
+
+ insert into poll (poll_id, question) values (13, 'What is your favorite gaming brand?');
+ insert into option (option_id, option_value, poll_id) values (37, 'Logitech', 13);
+ insert into option (option_id, option_value, poll_id) values (38, 'Corsair', 13);
+ insert into option (option_id, option_value, poll_id) values (39, 'HyperX', 13);
+
+ insert into poll (poll_id, question) values (14, 'What is your favorite food?');
+ insert into option (option_id, option_value, poll_id) values (40, 'Sushi', 14);
+ insert into option (option_id, option_value, poll_id) values (41, 'Pizza', 14);
+ insert into option (option_id, option_value, poll_id) values (42, 'Fries', 14);
+
+ insert into poll (poll_id, question) values (15, 'What is your favorite chip brand?');
+ insert into option (option_id, option_value, poll_id) values (43, 'Doritos', 15);
+ insert into option (option_id, option_value, poll_id) values (44, 'Lays', 15);
+ insert into option (option_id, option_value, poll_id) values (45, 'Herrs', 15);
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