diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..c5f3f6b
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ed84c9b..1fa25be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.zipcoder</groupId>
@@ -11,12 +11,14 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>1.5.3.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <relativePath /> <!-- lookup parent from repository -->
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <start-class>io.zipcoder.tc_spring_poll_application.QuickPollApplication</start-class>
-        <java.version>1.7</java.version>
+        <java.version>11</java.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
     <dependencies>
         <dependency>
@@ -43,7 +45,44 @@
             <artifactId>javax.inject</artifactId>
             <version>1</version>
         </dependency>
+
+        <!-- JAXB dependencies for Java 11 compatibility -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+
+        <!-- Swagger dependencies -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.7.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.7.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.activation</groupId>
+            <artifactId>javax.activation</artifactId>
+            <version>1.2.0</version>
+        </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/config/SwaggerConfig.java b/src/main/java/io/zipcoder/tc_spring_poll_application/config/SwaggerConfig.java
new file mode 100644
index 0000000..8ba7543
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/config/SwaggerConfig.java
@@ -0,0 +1,39 @@
+package io.zipcoder.tc_spring_poll_application.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.Collections;
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+    
+    @Bean
+    public Docket api() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .host("localhost:8080")
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("io.zipcoder.tc_spring_poll_application.controller"))
+                .paths(PathSelectors.any())
+                .build()
+                .apiInfo(apiInfo());
+    }
+    
+    private ApiInfo apiInfo() {
+        return new ApiInfo(
+                "Quick Poll API",
+                "API for managing polls and votes",
+                "1.0",
+                "Terms of service",
+                new Contact("ZipCode Wilmington", "www.zipcodewilmington.com", "info@zipcodewilmington.com"),
+                "License of API", "API license URL", Collections.emptyList());
+    }
+}
\ 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..9a6b984
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
@@ -0,0 +1,85 @@
+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.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 java.net.URI;
+
+import javax.validation.Valid;
+
+@RestController
+public class PollController {
+
+    private final PollRepository pollRepository;
+
+    @Autowired
+    public PollController(PollRepository pollRepository) {
+        this.pollRepository = pollRepository;
+    }
+
+    // GET all polls
+    @RequestMapping(value="/polls", method=RequestMethod.GET)
+    public ResponseEntity<Iterable<Poll>> getAllPolls() {
+        Iterable<Poll> allPolls = pollRepository.findAll();
+        return new ResponseEntity<>(allPolls, HttpStatus.OK);
+    }
+
+    // POST a new poll
+    @RequestMapping(value="/polls", method=RequestMethod.POST)
+    public ResponseEntity<?> createPoll(@Valid @RequestBody Poll poll) {
+
+        poll = pollRepository.save(poll);
+
+        // Build URI for the newly created poll
+        URI newPollUri = ServletUriComponentsBuilder
+                .fromCurrentRequest()
+                .path("/{id}")
+                .buildAndExpand(poll.getId())
+                .toUri();
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setLocation(newPollUri);
+
+        return new ResponseEntity<>(headers, HttpStatus.CREATED);
+    }
+
+    // GET a single poll by ID
+    @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);
+    }
+
+    // UPDATE a poll
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
+    public ResponseEntity<?> updatePoll(@Valid @RequestBody Poll poll, @PathVariable Long pollId) {
+        // Optionally, you could validate pollId matches poll.getId()
+        verifyPoll(pollId);
+        pollRepository.save(poll);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    // DELETE a poll
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.DELETE)
+    public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
+        verifyPoll(pollId);
+        pollRepository.delete(pollId);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    private void verifyPoll(Long pollId) {
+    Poll poll = pollRepository.findOne(pollId);
+    if (poll == null) {
+        throw new ResourceNotFoundException("Poll with id " + pollId + " not found");
+    }
+}
+
+}
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..4ab9ef6
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
@@ -0,0 +1,52 @@
+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 javax.validation.Valid;
+
+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 final VoteRepository voteRepository;
+
+    @Autowired
+    public VoteController(VoteRepository voteRepository) {
+        this.voteRepository = voteRepository;
+    }
+
+    // POST a new vote for a specific poll
+    @RequestMapping(value = "/polls/{pollId}/votes", method = RequestMethod.POST)
+    public ResponseEntity<?> createVote(@PathVariable Long pollId, @Valid @RequestBody Vote vote) {
+        vote = voteRepository.save(vote);
+
+        // Build the location URI for the newly created vote
+        HttpHeaders responseHeaders = new HttpHeaders();
+        responseHeaders.setLocation(ServletUriComponentsBuilder
+                .fromCurrentRequest()
+                .path("/{id}")
+                .buildAndExpand(vote.getId())
+                .toUri());
+
+        return new ResponseEntity<>(null, responseHeaders, HttpStatus.CREATED);
+    }
+
+    // GET all votes
+    @RequestMapping(value="/polls/votes", method=RequestMethod.GET)
+    public Iterable<Vote> getAllVotes() {
+        return voteRepository.findAll();
+    }
+
+    // GET all votes for a specific poll
+    @RequestMapping(value="/polls/{pollId}/votes", method=RequestMethod.GET)
+    public Iterable<Vote> getVotesByPoll(@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..77cd6f4
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java
@@ -0,0 +1,37 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Option {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "OPTION_ID")
+    private Long id;
+
+    @Column(name = "OPTION_VALUE")
+    private String value;
+
+    // Getter and Setter for id
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    // Getter and Setter for value
+    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..5bb4bb6
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
@@ -0,0 +1,57 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
+@Entity
+public class Poll {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "POLL_ID")
+    private Long id;
+
+    @Column(name = "QUESTION")
+    private String question;
+
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "POLL_ID")
+    @OrderBy
+    private Set<Option> options;
+
+    // Getter and Setter for id
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    // Getter and Setter for question
+    public String getQuestion() {
+        return question;
+    }
+
+    public void setQuestion(String question) {
+        this.question = question;
+    }
+
+    // Getter and Setter for options
+    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..f6c73d3
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java
@@ -0,0 +1,41 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class Vote {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "VOTE_ID")
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "OPTION_ID")
+    private Option option;
+
+    // Getter and Setter for id
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    // Getter and Setter for option
+    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/dto/error/ErrorDetail.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dto/error/ErrorDetail.java
new file mode 100644
index 0000000..b920d87
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dto/error/ErrorDetail.java
@@ -0,0 +1,63 @@
+package io.zipcoder.tc_spring_poll_application.dto.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;
+
+    // NEW FIELD
+    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/dto/error/ValidationError.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dto/error/ValidationError.java
new file mode 100644
index 0000000..37d0718
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dto/error/ValidationError.java
@@ -0,0 +1,29 @@
+package io.zipcoder.tc_spring_poll_application.dto.error;
+
+public class ValidationError {
+    private String code;
+    private String message;
+
+    public ValidationError() {}
+
+    public ValidationError(String code, String message) {
+        this.code = code;
+        this.message = 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..b3712bf
--- /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.web.bind.annotation.ResponseStatus;
+import org.springframework.http.HttpStatus;
+
+@ResponseStatus(HttpStatus.NOT_FOUND)
+public class ResourceNotFoundException extends RuntimeException {
+
+    public ResourceNotFoundException() {
+        super();
+    }
+
+    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..8df3604
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java
@@ -0,0 +1,60 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+
+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 io.zipcoder.tc_spring_poll_application.dto.error.ErrorDetail;
+import io.zipcoder.tc_spring_poll_application.dto.error.ValidationError;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+@ControllerAdvice
+public class RestExceptionHandler {
+
+    @Autowired
+    private MessageSource messageSource;
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?> handleValidationError(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());
+
+        // initialize the errors map
+        errorDetail.setErrors(new HashMap<>());
+
+        // loop through all field errors
+        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..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..1ac5b7e
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
@@ -0,0 +1,9 @@
+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.stereotype.Repository;
+
+@Repository
+public interface PollRepository 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..3878f54
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
@@ -0,0 +1,17 @@
+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> {
+
+    // Custom query to find all votes for a specific poll
+    @Query(value = "SELECT v.* " +
+            "FROM Option o, Vote v " +
+            "WHERE o.POLL_ID = ?1 " +
+            "AND v.OPTION_ID = o.OPTION_ID", nativeQuery = true)
+    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..1705ca4
--- /dev/null
+++ b/src/main/resources/import.sql
@@ -0,0 +1,97 @@
+-- Poll 1
+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);
+
+-- Poll 2
+insert into poll (poll_id, question) values (2, 'What is your favorite programming language?');
+insert into option (option_id, option_value, poll_id) values (4, 'Java', 2);
+insert into option (option_id, option_value, poll_id) values (5, 'Python', 2);
+insert into option (option_id, option_value, poll_id) values (6, 'JavaScript', 2);
+
+-- Poll 3
+insert into poll (poll_id, question) values (3, 'Which season do you like most?');
+insert into option (option_id, option_value, poll_id) values (7, 'Spring', 3);
+insert into option (option_id, option_value, poll_id) values (8, 'Summer', 3);
+insert into option (option_id, option_value, poll_id) values (9, 'Winter', 3);
+
+-- Poll 4
+insert into poll (poll_id, question) values (4, 'Which social media platform do you use the most?');
+insert into option (option_id, option_value, poll_id) values (10, 'Facebook', 4);
+insert into option (option_id, option_value, poll_id) values (11, 'Instagram', 4);
+insert into option (option_id, option_value, poll_id) values (12, 'Twitter', 4);
+insert into option (option_id, option_value, poll_id) values (13, 'TikTok', 4);
+
+-- Poll 5
+insert into poll (poll_id, question) values (5, 'Favorite type of cuisine?');
+insert into option (option_id, option_value, poll_id) values (14, 'Italian', 5);
+insert into option (option_id, option_value, poll_id) values (15, 'Mexican', 5);
+insert into option (option_id, option_value, poll_id) values (16, 'Chinese', 5);
+insert into option (option_id, option_value, poll_id) values (17, 'Indian', 5);
+
+-- Poll 6
+insert into poll (poll_id, question) values (6, 'Which pet do you prefer?');
+insert into option (option_id, option_value, poll_id) values (18, 'Dog', 6);
+insert into option (option_id, option_value, poll_id) values (19, 'Cat', 6);
+insert into option (option_id, option_value, poll_id) values (20, 'Fish', 6);
+
+-- Poll 7
+insert into poll (poll_id, question) values (7, 'Preferred type of movie?');
+insert into option (option_id, option_value, poll_id) values (21, 'Action', 7);
+insert into option (option_id, option_value, poll_id) values (22, 'Comedy', 7);
+insert into option (option_id, option_value, poll_id) values (23, 'Horror', 7);
+insert into option (option_id, option_value, poll_id) values (24, 'Drama', 7);
+
+-- Poll 8
+insert into poll (poll_id, question) values (8, 'Favorite music genre?');
+insert into option (option_id, option_value, poll_id) values (25, 'Pop', 8);
+insert into option (option_id, option_value, poll_id) values (26, 'Rock', 8);
+insert into option (option_id, option_value, poll_id) values (27, 'Hip Hop', 8);
+insert into option (option_id, option_value, poll_id) values (28, 'Classical', 8);
+
+-- Poll 9
+insert into poll (poll_id, question) values (9, 'Which sport do you watch the most?');
+insert into option (option_id, option_value, poll_id) values (29, 'Soccer', 9);
+insert into option (option_id, option_value, poll_id) values (30, 'Basketball', 9);
+insert into option (option_id, option_value, poll_id) values (31, 'Tennis', 9);
+insert into option (option_id, option_value, poll_id) values (32, 'Baseball', 9);
+
+-- Poll 10
+insert into poll (poll_id, question) values (10, 'Favorite beverage?');
+insert into option (option_id, option_value, poll_id) values (33, 'Coffee', 10);
+insert into option (option_id, option_value, poll_id) values (34, 'Tea', 10);
+insert into option (option_id, option_value, poll_id) values (35, 'Juice', 10);
+insert into option (option_id, option_value, poll_id) values (36, 'Water', 10);
+
+-- Poll 11
+insert into poll (poll_id, question) values (11, 'Which device do you use most?');
+insert into option (option_id, option_value, poll_id) values (37, 'Smartphone', 11);
+insert into option (option_id, option_value, poll_id) values (38, 'Laptop', 11);
+insert into option (option_id, option_value, poll_id) values (39, 'Tablet', 11);
+
+-- Poll 12
+insert into poll (poll_id, question) values (12, 'Favorite type of vacation?');
+insert into option (option_id, option_value, poll_id) values (40, 'Beach', 12);
+insert into option (option_id, option_value, poll_id) values (41, 'Mountains', 12);
+insert into option (option_id, option_value, poll_id) values (42, 'City', 12);
+
+-- Poll 13
+insert into poll (poll_id, question) values (13, 'Preferred type of book?');
+insert into option (option_id, option_value, poll_id) values (43, 'Fiction', 13);
+insert into option (option_id, option_value, poll_id) values (44, 'Non-fiction', 13);
+insert into option (option_id, option_value, poll_id) values (45, 'Biography', 13);
+insert into option (option_id, option_value, poll_id) values (46, 'Mystery', 13);
+
+-- Poll 14
+insert into poll (poll_id, question) values (14, 'Favorite streaming service?');
+insert into option (option_id, option_value, poll_id) values (47, 'Netflix', 14);
+insert into option (option_id, option_value, poll_id) values (48, 'Hulu', 14);
+insert into option (option_id, option_value, poll_id) values (49, 'Disney+', 14);
+insert into option (option_id, option_value, poll_id) values (50, 'Amazon Prime', 14);
+
+-- Poll 15
+insert into poll (poll_id, question) values (15, 'Favorite programming paradigm?');
+insert into option (option_id, option_value, poll_id) values (51, 'Object-Oriented', 15);
+insert into option (option_id, option_value, poll_id) values (52, 'Functional', 15);
+insert into option (option_id, option_value, poll_id) values (53, 'Procedural', 15);
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