diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5a979af
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,40 @@
+HELP.md
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+
+### Kotlin ###
+.kotlin
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..e1f220a
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,41 @@
+plugins {
+	id 'org.springframework.boot' version '3.3.2'
+	id 'io.spring.dependency-management' version '1.1.6'
+	id 'org.jetbrains.kotlin.plugin.jpa' version '1.9.24'
+	id 'org.jetbrains.kotlin.jvm' version '1.9.24'
+	id 'org.jetbrains.kotlin.plugin.spring' version '1.9.24'
+}
+
+group = 'innerCircle'
+version = '0.0.1-SNAPSHOT'
+
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(17)
+	}
+}
+
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'com.fasterxml.jackson.module:jackson-module-kotlin'
+	implementation 'org.jetbrains.kotlin:kotlin-reflect'
+	runtimeOnly 'com.h2database:h2'
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+}
+
+kotlin {
+	compilerOptions {
+		freeCompilerArgs.addAll '-Xjsr305=strict'
+	}
+}
+
+tasks.named('test') {
+	useJUnitPlatform()
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..e644113
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..a441313
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..b740cf1
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,249 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..7101f8e
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..a6480d6
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'survey'
diff --git a/src/main/kotlin/innerCircle/survey/SurveyApplication.kt b/src/main/kotlin/innerCircle/survey/SurveyApplication.kt
new file mode 100644
index 0000000..e2b8fcd
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/SurveyApplication.kt
@@ -0,0 +1,11 @@
+package innerCircle.survey
+
+import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.runApplication
+
+@SpringBootApplication
+class SurveyApplication
+
+fun main(args: Array<String>) {
+	runApplication<SurveyApplication>(*args)
+}
diff --git a/src/main/kotlin/innerCircle/survey/common/QuestionType.kt b/src/main/kotlin/innerCircle/survey/common/QuestionType.kt
new file mode 100644
index 0000000..15d442c
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/common/QuestionType.kt
@@ -0,0 +1,8 @@
+package innerCircle.survey.common
+
+enum class QuestionType {
+    SHORT_TEXT,
+    LONG_TEXT,
+    SINGLE_CHOICE,
+    MULTIPLE_CHOICE
+}
diff --git a/src/main/kotlin/innerCircle/survey/controller/SurveyController.kt b/src/main/kotlin/innerCircle/survey/controller/SurveyController.kt
new file mode 100644
index 0000000..1ec3aeb
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/controller/SurveyController.kt
@@ -0,0 +1,67 @@
+package innerCircle.survey.controller
+
+import innerCircle.survey.dto.CreateSurveyRequest
+import innerCircle.survey.dto.DeleteQuestionRequest
+import innerCircle.survey.dto.UpdateSurveyRequest
+import innerCircle.survey.service.SurveyService
+import org.springframework.http.HttpStatus
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.*
+
+@RestController
+@RequestMapping("/api/surveys")
+class SurveyController(
+    private val surveyService: SurveyService
+) {
+
+    @PostMapping
+    fun createSurvey(@RequestBody request: CreateSurveyRequest): ResponseEntity<Void> {
+        surveyService.createSurvey(request)
+        return ResponseEntity(HttpStatus.CREATED)
+    }
+
+    @PutMapping("/{surveyId}")
+    fun updateSurvey(
+        @PathVariable surveyId: Long,
+        @RequestBody request: UpdateSurveyRequest
+    ): ResponseEntity<Void> {
+        surveyService.updateQuestions(surveyId, request)
+        return ResponseEntity(HttpStatus.NO_CONTENT)
+    }
+
+    @PatchMapping("/{surveyId}/questions")
+    fun addQuestions(
+        @PathVariable surveyId: Long,
+        @RequestBody request: UpdateSurveyRequest
+    ): ResponseEntity<Void> {
+        surveyService.addQuestions(surveyId, request)
+        return ResponseEntity(HttpStatus.NO_CONTENT)
+    }
+
+    @DeleteMapping("/{surveyId}/questions/{questionId}")
+    fun deleteSingleQuestion(
+        @PathVariable surveyId: Long,
+        @PathVariable questionId: Long
+    ): ResponseEntity<Void> {
+        try {
+            surveyService.deleteSingleQuestion(surveyId, questionId)
+            return ResponseEntity(HttpStatus.NO_CONTENT)
+        } catch (e: IllegalArgumentException) {
+            return ResponseEntity(HttpStatus.BAD_REQUEST)
+        }
+    }
+
+    @DeleteMapping("/{surveyId}/questions")
+    fun deleteMultipleQuestions(
+        @PathVariable surveyId: Long,
+        @RequestBody request: DeleteQuestionRequest
+    ): ResponseEntity<Void> {
+        try {
+            surveyService.deleteMultipleQuestions(surveyId, request.questionIds)
+            return ResponseEntity(HttpStatus.NO_CONTENT)
+        } catch (e: IllegalArgumentException) {
+            return ResponseEntity(HttpStatus.BAD_REQUEST)
+        }
+    }
+
+}
diff --git a/src/main/kotlin/innerCircle/survey/controller/SurveyResponseController.kt b/src/main/kotlin/innerCircle/survey/controller/SurveyResponseController.kt
new file mode 100644
index 0000000..7cb1aeb
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/controller/SurveyResponseController.kt
@@ -0,0 +1,31 @@
+package innerCircle.survey.controller
+
+import innerCircle.survey.dto.SurveyResponseRequest
+import innerCircle.survey.dto.SurveyResponseQuery
+import innerCircle.survey.dto.SurveyResponseDto
+import innerCircle.survey.service.SurveyResponseService
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.*
+
+@RestController
+@RequestMapping("/api/surveys")
+class SurveyResponseController(
+    private val surveyResponseService: SurveyResponseService
+) {
+
+    @PostMapping("/responses")
+    fun submitSurveyResponse(@RequestBody request: SurveyResponseRequest): ResponseEntity<String> {
+        surveyResponseService.submitSurveyResponse(request)
+        return ResponseEntity.ok("Survey response submitted successfully.")
+    }
+
+    @GetMapping("/responses")
+    fun getSurveyResponses(
+        @RequestParam surveyId: Long,
+        @RequestParam(required = false) questionName: String?,
+        @RequestParam(required = false) responseValue: String?
+    ): ResponseEntity<List<SurveyResponseDto>> {
+        val responses = surveyResponseService.getSurveyResponses(surveyId, questionName, responseValue)
+        return ResponseEntity.ok(responses)
+    }
+}
diff --git a/src/main/kotlin/innerCircle/survey/dto/CreateSurveyRequest.kt b/src/main/kotlin/innerCircle/survey/dto/CreateSurveyRequest.kt
new file mode 100644
index 0000000..4f07420
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/dto/CreateSurveyRequest.kt
@@ -0,0 +1,7 @@
+package innerCircle.survey.dto
+
+data class CreateSurveyRequest(
+    val name: String,
+    val description: String,
+    val questions: List<QuestionRequest>
+)
\ No newline at end of file
diff --git a/src/main/kotlin/innerCircle/survey/dto/DeleteQuestionRequest.kt b/src/main/kotlin/innerCircle/survey/dto/DeleteQuestionRequest.kt
new file mode 100644
index 0000000..e109a0a
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/dto/DeleteQuestionRequest.kt
@@ -0,0 +1,5 @@
+package innerCircle.survey.dto
+
+data class DeleteQuestionRequest(
+    val questionIds: List<Long>
+)
diff --git a/src/main/kotlin/innerCircle/survey/dto/QuestionRequest.kt b/src/main/kotlin/innerCircle/survey/dto/QuestionRequest.kt
new file mode 100644
index 0000000..482e98a
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/dto/QuestionRequest.kt
@@ -0,0 +1,11 @@
+package innerCircle.survey.dto
+
+import innerCircle.survey.common.QuestionType
+
+data class QuestionRequest(
+    val name: String,
+    val description: String,
+    val questionType: QuestionType,
+    val isRequired: Boolean,
+    val options: List<String>?
+)
\ No newline at end of file
diff --git a/src/main/kotlin/innerCircle/survey/dto/QuestionResponse.kt b/src/main/kotlin/innerCircle/survey/dto/QuestionResponse.kt
new file mode 100644
index 0000000..5fb9711
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/dto/QuestionResponse.kt
@@ -0,0 +1,6 @@
+package innerCircle.survey.dto
+
+data class QuestionResponse(
+    val questionId: Long,
+    val responseValue: String
+)
\ No newline at end of file
diff --git a/src/main/kotlin/innerCircle/survey/dto/QuestionUpdateRequest.kt b/src/main/kotlin/innerCircle/survey/dto/QuestionUpdateRequest.kt
new file mode 100644
index 0000000..91c7aa5
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/dto/QuestionUpdateRequest.kt
@@ -0,0 +1,12 @@
+package innerCircle.survey.dto
+
+import innerCircle.survey.common.QuestionType
+
+data class QuestionUpdateRequest(
+    val id: Long? = null,
+    val name: String,
+    val description: String,
+    val questionType: QuestionType,
+    val isRequired: Boolean,
+    val options: List<String>?
+)
\ No newline at end of file
diff --git a/src/main/kotlin/innerCircle/survey/dto/SurveyResponseAnswerDto.kt b/src/main/kotlin/innerCircle/survey/dto/SurveyResponseAnswerDto.kt
new file mode 100644
index 0000000..4801234
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/dto/SurveyResponseAnswerDto.kt
@@ -0,0 +1,10 @@
+package innerCircle.survey.dto
+
+import innerCircle.survey.common.QuestionType
+
+data class SurveyResponseAnswerDto(
+    val questionId: Long,
+    val questionName: String,
+    val answerValue: String?,
+    val options: List<QuestionType>?
+)
diff --git a/src/main/kotlin/innerCircle/survey/dto/SurveyResponseAnswerOptionDto.kt b/src/main/kotlin/innerCircle/survey/dto/SurveyResponseAnswerOptionDto.kt
new file mode 100644
index 0000000..83961d9
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/dto/SurveyResponseAnswerOptionDto.kt
@@ -0,0 +1,6 @@
+package innerCircle.survey.dto
+
+data class SurveyResponseAnswerOptionDto(
+    val questionId: Long,
+    val optionValue: String
+)
\ No newline at end of file
diff --git a/src/main/kotlin/innerCircle/survey/dto/SurveyResponseDto.kt b/src/main/kotlin/innerCircle/survey/dto/SurveyResponseDto.kt
new file mode 100644
index 0000000..24d5cd5
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/dto/SurveyResponseDto.kt
@@ -0,0 +1,7 @@
+package innerCircle.survey.dto
+
+data class SurveyResponseDto(
+    val id: Long,
+    val submittedAt: String,
+    val answers: List<SurveyResponseAnswerDto>
+)
diff --git a/src/main/kotlin/innerCircle/survey/dto/SurveyResponseRequest.kt b/src/main/kotlin/innerCircle/survey/dto/SurveyResponseRequest.kt
new file mode 100644
index 0000000..330a6a9
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/dto/SurveyResponseRequest.kt
@@ -0,0 +1,6 @@
+package innerCircle.survey.dto
+
+data class SurveyResponseRequest(
+    val surveyId: Long,
+    val responses: List<QuestionResponse>
+)
\ No newline at end of file
diff --git a/src/main/kotlin/innerCircle/survey/dto/UpdateSurveyRequest.kt b/src/main/kotlin/innerCircle/survey/dto/UpdateSurveyRequest.kt
new file mode 100644
index 0000000..c908db6
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/dto/UpdateSurveyRequest.kt
@@ -0,0 +1,7 @@
+package innerCircle.survey.dto
+
+data class UpdateSurveyRequest(
+    val name: String,
+    val description: String,
+    val questions: List<QuestionUpdateRequest>
+)
\ No newline at end of file
diff --git a/src/main/kotlin/innerCircle/survey/entity/Survey.kt b/src/main/kotlin/innerCircle/survey/entity/Survey.kt
new file mode 100644
index 0000000..bcd940e
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/entity/Survey.kt
@@ -0,0 +1,24 @@
+package innerCircle.survey.entity
+
+import innerCircle.survey.dto.CreateSurveyRequest
+import jakarta.persistence.Entity
+import jakarta.persistence.GeneratedValue
+import jakarta.persistence.GenerationType
+import jakarta.persistence.Id
+
+@Entity
+data class Survey(
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    val id: Long? = null,
+    val name: String,
+    val description: String
+){
+    companion object {
+        fun create(name: String, description: String): Survey {
+            return Survey(
+                name = name,
+                description = description
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/innerCircle/survey/entity/SurveyQuestion.kt b/src/main/kotlin/innerCircle/survey/entity/SurveyQuestion.kt
new file mode 100644
index 0000000..8eed436
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/entity/SurveyQuestion.kt
@@ -0,0 +1,67 @@
+package innerCircle.survey.entity
+
+import innerCircle.survey.common.QuestionType
+import innerCircle.survey.dto.QuestionRequest
+import innerCircle.survey.dto.QuestionUpdateRequest
+import jakarta.persistence.Entity
+import jakarta.persistence.Enumerated
+import jakarta.persistence.EnumType
+import jakarta.persistence.GeneratedValue
+import jakarta.persistence.GenerationType
+import jakarta.persistence.Id
+import jakarta.persistence.JoinColumn
+import jakarta.persistence.ManyToOne
+import java.time.LocalDateTime
+
+@Entity
+data class SurveyQuestion(
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    val id: Long? = null,
+    @ManyToOne @JoinColumn(name = "survey_version_id")
+    val surveyVersion: SurveyVersion,
+    val name: String,
+    val description: String?,
+    @Enumerated(EnumType.STRING)
+    val questionType: QuestionType,
+    val isRequired: Boolean,
+    val deletedAt: LocalDateTime? = null
+){
+    companion object {
+        fun create(name: String, description: String,
+                   questionType: QuestionType, isRequired: Boolean,
+                   surveyVersion: SurveyVersion): SurveyQuestion {
+            return SurveyQuestion(
+                surveyVersion = surveyVersion,
+                name = name,
+                description = description,
+                questionType = questionType,
+                isRequired = isRequired
+            )
+        }
+    }
+
+    fun update(name: String, description: String,
+               questionType: QuestionType, isRequired: Boolean,
+               newSurveyVersion: SurveyVersion): SurveyQuestion {
+        return copy(
+            name = name,
+            description = description,
+            questionType = questionType,
+            isRequired = isRequired,
+            surveyVersion = newSurveyVersion
+        )
+    }
+
+    fun createOptions(options: List<String>?): List<SurveyQuestionOption> {
+        return if (questionType == QuestionType.SINGLE_CHOICE || questionType == QuestionType.MULTIPLE_CHOICE) {
+            options?.map { optionValue ->
+                SurveyQuestionOption(
+                    question = this,
+                    optionValue = optionValue
+                )
+            } ?: emptyList()
+        } else {
+            emptyList()
+        }
+    }
+}
diff --git a/src/main/kotlin/innerCircle/survey/entity/SurveyQuestionOption.kt b/src/main/kotlin/innerCircle/survey/entity/SurveyQuestionOption.kt
new file mode 100644
index 0000000..64c6c5a
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/entity/SurveyQuestionOption.kt
@@ -0,0 +1,17 @@
+package innerCircle.survey.entity
+
+import jakarta.persistence.Entity
+import jakarta.persistence.GeneratedValue
+import jakarta.persistence.GenerationType
+import jakarta.persistence.Id
+import jakarta.persistence.JoinColumn
+import jakarta.persistence.ManyToOne
+
+@Entity
+data class SurveyQuestionOption(
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    val id: Long? = null,
+    @ManyToOne @JoinColumn(name = "question_id")
+    val question: SurveyQuestion,
+    val optionValue: String
+)
diff --git a/src/main/kotlin/innerCircle/survey/entity/SurveyResponse.kt b/src/main/kotlin/innerCircle/survey/entity/SurveyResponse.kt
new file mode 100644
index 0000000..f6b7d3e
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/entity/SurveyResponse.kt
@@ -0,0 +1,18 @@
+package innerCircle.survey.entity
+
+import jakarta.persistence.Entity
+import jakarta.persistence.GeneratedValue
+import jakarta.persistence.GenerationType
+import jakarta.persistence.Id
+import jakarta.persistence.JoinColumn
+import jakarta.persistence.ManyToOne
+import java.time.LocalDateTime
+
+@Entity
+data class SurveyResponse(
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    val id: Long? = null,
+    @ManyToOne @JoinColumn(name = "survey_version_id")
+    val surveyVersion: SurveyVersion,
+    val submittedAt: LocalDateTime = LocalDateTime.now()
+)
diff --git a/src/main/kotlin/innerCircle/survey/entity/SurveyResponseAnswer.kt b/src/main/kotlin/innerCircle/survey/entity/SurveyResponseAnswer.kt
new file mode 100644
index 0000000..8745766
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/entity/SurveyResponseAnswer.kt
@@ -0,0 +1,19 @@
+package innerCircle.survey.entity
+
+import jakarta.persistence.Entity
+import jakarta.persistence.GeneratedValue
+import jakarta.persistence.GenerationType
+import jakarta.persistence.Id
+import jakarta.persistence.JoinColumn
+import jakarta.persistence.ManyToOne
+
+@Entity
+data class SurveyResponseAnswer(
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    val id: Long? = null,
+    @ManyToOne @JoinColumn(name = "response_id")
+    val response: SurveyResponse,
+    @ManyToOne @JoinColumn(name = "question_id")
+    val question: SurveyQuestion,
+    val answerValue: String? // For short/long text responses
+)
diff --git a/src/main/kotlin/innerCircle/survey/entity/SurveyResponseAnswerOption.kt b/src/main/kotlin/innerCircle/survey/entity/SurveyResponseAnswerOption.kt
new file mode 100644
index 0000000..21e2de4
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/entity/SurveyResponseAnswerOption.kt
@@ -0,0 +1,19 @@
+package innerCircle.survey.entity
+
+import jakarta.persistence.Entity
+import jakarta.persistence.GeneratedValue
+import jakarta.persistence.GenerationType
+import jakarta.persistence.Id
+import jakarta.persistence.JoinColumn
+import jakarta.persistence.ManyToOne
+
+@Entity
+data class SurveyResponseAnswerOption(
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    val id: Long? = null,
+    @ManyToOne @JoinColumn(name = "response_id")
+    val response: SurveyResponse,
+    @ManyToOne @JoinColumn(name = "question_id")
+    val question: SurveyQuestion,
+    val optionValue: String // For single/multiple choice responses
+)
diff --git a/src/main/kotlin/innerCircle/survey/entity/SurveyVersion.kt b/src/main/kotlin/innerCircle/survey/entity/SurveyVersion.kt
new file mode 100644
index 0000000..c29906d
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/entity/SurveyVersion.kt
@@ -0,0 +1,28 @@
+package innerCircle.survey.entity
+
+import jakarta.persistence.Entity
+import jakarta.persistence.GeneratedValue
+import jakarta.persistence.GenerationType
+import jakarta.persistence.Id
+import jakarta.persistence.JoinColumn
+import jakarta.persistence.ManyToOne
+import java.time.LocalDateTime
+
+@Entity
+data class SurveyVersion(
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    val id: Long? = null,
+    @ManyToOne @JoinColumn(name = "survey_id")
+    val survey: Survey,
+    val version: Int,
+    val createdAt: LocalDateTime = LocalDateTime.now()
+){
+    companion object {
+        fun create(survey: Survey): SurveyVersion {
+            return SurveyVersion(
+                survey = survey,
+                version = 1
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/innerCircle/survey/repository/SurveyQuestionOptionRepository.kt b/src/main/kotlin/innerCircle/survey/repository/SurveyQuestionOptionRepository.kt
new file mode 100644
index 0000000..8bec146
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/repository/SurveyQuestionOptionRepository.kt
@@ -0,0 +1,8 @@
+package innerCircle.survey.repository
+
+import innerCircle.survey.entity.SurveyQuestionOption
+import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.stereotype.Repository
+
+@Repository
+interface SurveyQuestionOptionRepository : JpaRepository<SurveyQuestionOption, Long>
diff --git a/src/main/kotlin/innerCircle/survey/repository/SurveyQuestionRepository.kt b/src/main/kotlin/innerCircle/survey/repository/SurveyQuestionRepository.kt
new file mode 100644
index 0000000..136a98c
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/repository/SurveyQuestionRepository.kt
@@ -0,0 +1,21 @@
+package innerCircle.survey.repository
+
+import innerCircle.survey.entity.SurveyQuestion
+import innerCircle.survey.entity.SurveyVersion
+import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Modifying
+import org.springframework.data.jpa.repository.Query
+import org.springframework.data.repository.query.Param
+import org.springframework.stereotype.Repository
+import java.time.LocalDateTime
+
+@Repository
+interface SurveyQuestionRepository : JpaRepository<SurveyQuestion, Long>{
+
+    fun findBySurveyVersion(surveyVersion: SurveyVersion): List<SurveyQuestion>
+
+    @Modifying
+    @Query("UPDATE SurveyQuestion q SET q.deletedAt = :deletedAt WHERE q.id IN :ids")
+    fun markAsDeleted(@Param("ids") ids: List<Long>, @Param("deletedAt") deletedAt: LocalDateTime)
+}
+
diff --git a/src/main/kotlin/innerCircle/survey/repository/SurveyRepository.kt b/src/main/kotlin/innerCircle/survey/repository/SurveyRepository.kt
new file mode 100644
index 0000000..7cd8e50
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/repository/SurveyRepository.kt
@@ -0,0 +1,8 @@
+package innerCircle.survey.repository
+
+import innerCircle.survey.entity.Survey
+import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.stereotype.Repository
+
+@Repository
+interface SurveyRepository : JpaRepository<Survey, Long>
diff --git a/src/main/kotlin/innerCircle/survey/repository/SurveyResponseAnswerOptionRepository.kt b/src/main/kotlin/innerCircle/survey/repository/SurveyResponseAnswerOptionRepository.kt
new file mode 100644
index 0000000..79b6e46
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/repository/SurveyResponseAnswerOptionRepository.kt
@@ -0,0 +1,10 @@
+package innerCircle.survey.repository
+
+import innerCircle.survey.entity.SurveyQuestion
+import innerCircle.survey.entity.SurveyResponse
+import innerCircle.survey.entity.SurveyResponseAnswerOption
+import org.springframework.data.jpa.repository.JpaRepository
+
+interface SurveyResponseAnswerOptionRepository : JpaRepository<SurveyResponseAnswerOption, Long> {
+    fun findByQuestionAndResponse(question: SurveyQuestion, response: SurveyResponse): List<SurveyResponseAnswerOption>
+}
diff --git a/src/main/kotlin/innerCircle/survey/repository/SurveyResponseAnswerRepository.kt b/src/main/kotlin/innerCircle/survey/repository/SurveyResponseAnswerRepository.kt
new file mode 100644
index 0000000..772f416
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/repository/SurveyResponseAnswerRepository.kt
@@ -0,0 +1,11 @@
+package innerCircle.survey.repository
+
+import innerCircle.survey.entity.SurveyResponseAnswer
+import innerCircle.survey.entity.SurveyResponse
+import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.stereotype.Repository
+
+@Repository
+interface SurveyResponseAnswerRepository : JpaRepository<SurveyResponseAnswer, Long> {
+    fun findByResponse(response: SurveyResponse): List<SurveyResponseAnswer>
+}
diff --git a/src/main/kotlin/innerCircle/survey/repository/SurveyResponseRepository.kt b/src/main/kotlin/innerCircle/survey/repository/SurveyResponseRepository.kt
new file mode 100644
index 0000000..4913f2f
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/repository/SurveyResponseRepository.kt
@@ -0,0 +1,12 @@
+package innerCircle.survey.repository
+
+import innerCircle.survey.entity.SurveyQuestion
+import innerCircle.survey.entity.SurveyResponse
+import innerCircle.survey.entity.SurveyVersion
+import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.stereotype.Repository
+
+@Repository
+interface SurveyResponseRepository : JpaRepository<SurveyResponse, Long> {
+    fun findBySurveyVersion(surveyVersion: SurveyVersion): List<SurveyResponse>
+}
diff --git a/src/main/kotlin/innerCircle/survey/repository/SurveyVersionRepository.kt b/src/main/kotlin/innerCircle/survey/repository/SurveyVersionRepository.kt
new file mode 100644
index 0000000..75d04e6
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/repository/SurveyVersionRepository.kt
@@ -0,0 +1,17 @@
+package innerCircle.survey.repository
+
+import innerCircle.survey.entity.Survey
+import innerCircle.survey.entity.SurveyVersion
+import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
+import org.springframework.data.repository.query.Param
+import org.springframework.stereotype.Repository
+
+@Repository
+interface SurveyVersionRepository : JpaRepository<SurveyVersion, Long>{
+    fun findBySurvey(survey: Survey): List<SurveyVersion>
+
+    @Query("SELECT sv FROM SurveyVersion sv WHERE sv.survey = :survey ORDER BY sv.createdAt DESC")
+    fun findLatestBySurvey(@Param("survey") survey: Survey): SurveyVersion?
+
+}
diff --git a/src/main/kotlin/innerCircle/survey/service/SurveyResponseService.kt b/src/main/kotlin/innerCircle/survey/service/SurveyResponseService.kt
new file mode 100644
index 0000000..eb47e09
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/service/SurveyResponseService.kt
@@ -0,0 +1,106 @@
+package innerCircle.survey.service
+
+import innerCircle.survey.common.QuestionType
+import innerCircle.survey.dto.*
+import innerCircle.survey.entity.*
+import innerCircle.survey.repository.*
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+
+@Service
+class SurveyResponseService(
+    private val surveyRepository: SurveyRepository,
+    private val surveyVersionRepository: SurveyVersionRepository,
+    private val surveyQuestionRepository: SurveyQuestionRepository,
+    private val surveyResponseRepository: SurveyResponseRepository,
+    private val surveyResponseAnswerRepository: SurveyResponseAnswerRepository,
+    private val surveyResponseAnswerOptionRepository: SurveyResponseAnswerOptionRepository
+) {
+
+    @Transactional
+    fun submitSurveyResponse(request: SurveyResponseRequest) {
+        val survey = surveyRepository.findById(request.surveyId).orElseThrow {
+            IllegalArgumentException("Survey with ID ${request.surveyId} not found.")
+        }
+
+        val lastSurvey = surveyVersionRepository.findLatestBySurvey(survey)!!
+        val questions = surveyQuestionRepository.findBySurveyVersion(lastSurvey)
+        val questionMap = questions.associateBy { it.id }
+
+        // Create SurveyResponse
+        val surveyResponse = SurveyResponse(
+            surveyVersion = lastSurvey
+        )
+        surveyResponseRepository.save(surveyResponse)
+
+        // Validate and save responses
+        val responsesGroupedByQuestionId = request.responses.groupBy { it.questionId }
+
+        responsesGroupedByQuestionId.forEach { (questionId, responsesForQuestion) ->
+            val question = questionMap[questionId]
+                ?: throw IllegalArgumentException("Question with ID $questionId not found.")
+
+            when (question.questionType) {
+                QuestionType.SINGLE_CHOICE, QuestionType.MULTIPLE_CHOICE -> {
+                    val optionValues = responsesForQuestion.map { it.responseValue }
+                    val validOptions = question.createOptions(null).map { it.optionValue }
+                    optionValues.forEach { responseValue ->
+                        if (!validOptions.contains(responseValue)) {
+                            throw IllegalArgumentException("Response value $responseValue is not valid for question with ID $questionId.")
+                        }
+                    }
+                    responsesForQuestion.forEach { response ->
+                        val surveyResponseAnswerOption = SurveyResponseAnswerOption(
+                            response = surveyResponse,
+                            question = question,
+                            optionValue = response.responseValue
+                        )
+                        surveyResponseAnswerOptionRepository.save(surveyResponseAnswerOption)
+                    }
+                }
+                else -> {
+                    responsesForQuestion.forEach { response ->
+                        val surveyResponseAnswer = SurveyResponseAnswer(
+                            response = surveyResponse,
+                            question = question,
+                            answerValue = response.responseValue
+                        )
+                        surveyResponseAnswerRepository.save(surveyResponseAnswer)
+                    }
+                }
+            }
+        }
+    }
+
+    fun getSurveyResponses(surveyId: Long, questionName: String?, responseValue: String?): List<SurveyResponseDto> {
+        val survey = surveyRepository.findById(surveyId).orElseThrow {
+            IllegalArgumentException("Survey with ID ${surveyId} not found.")
+        }
+
+        val lastSurvey = surveyVersionRepository.findLatestBySurvey(survey)!!
+        val responses = surveyResponseRepository.findBySurveyVersion(lastSurvey)
+
+        return responses.map { response ->
+            val answers = surveyResponseAnswerRepository.findByResponse(response).map { answer ->
+                val question = answer.question
+                val options = if (question.questionType in listOf(QuestionType.SINGLE_CHOICE, QuestionType.MULTIPLE_CHOICE)) {
+                    surveyResponseAnswerOptionRepository.findByQuestionAndResponse(question, response)
+                        .map { it.optionValue }
+                } else {
+                    null
+                }
+                SurveyResponseAnswerDto(
+                    questionId = question.id!!,
+                    questionName = question.name,
+                    answerValue = answer.answerValue,
+                    options = options
+                )
+            }
+            SurveyResponseDto(
+                id = response.id!!,
+                submittedAt = response.submittedAt.toString(),
+                answers = answers
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/innerCircle/survey/service/SurveyService.kt b/src/main/kotlin/innerCircle/survey/service/SurveyService.kt
new file mode 100644
index 0000000..49dae12
--- /dev/null
+++ b/src/main/kotlin/innerCircle/survey/service/SurveyService.kt
@@ -0,0 +1,201 @@
+package innerCircle.survey.service
+
+import innerCircle.survey.dto.CreateSurveyRequest
+import innerCircle.survey.dto.UpdateSurveyRequest
+import innerCircle.survey.entity.*
+import innerCircle.survey.repository.SurveyQuestionOptionRepository
+import innerCircle.survey.repository.SurveyQuestionRepository
+import innerCircle.survey.repository.SurveyRepository
+import innerCircle.survey.repository.SurveyVersionRepository
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+import java.time.LocalDateTime
+
+@Service
+class SurveyService(
+    private val surveyRepository: SurveyRepository,
+    private val surveyVersionRepository: SurveyVersionRepository,
+    private val surveyQuestionRepository: SurveyQuestionRepository,
+    private val surveyQuestionOptionRepository: SurveyQuestionOptionRepository
+) {
+
+    @Transactional
+    fun createSurvey(request: CreateSurveyRequest) {
+        val survey = createSurveyEntity(request)
+        surveyRepository.save(survey)
+
+        val surveyVersion = createSurveyVersionEntity(survey)
+        surveyVersionRepository.save(surveyVersion)
+
+        val surveyQuestions = createSurveyQuestions(request, surveyVersion)
+        surveyQuestionRepository.saveAll(surveyQuestions)
+
+        val surveyQuestionOptions = createSurveyQuestionOptions(request, surveyQuestions)
+        if (surveyQuestionOptions.isNotEmpty()) {
+            surveyQuestionOptionRepository.saveAll(surveyQuestionOptions)
+        }
+    }
+
+    @Transactional
+    fun addQuestions(surveyId: Long, request: UpdateSurveyRequest) {
+        val survey = getSurveyById(surveyId)
+        val currentVersion = getCurrentSurveyVersion(survey)
+        val newSurveyVersion = createSurveyVersionEntity(survey)
+        surveyVersionRepository.save(newSurveyVersion)
+
+        val existingQuestions = surveyQuestionRepository.findBySurveyVersion(currentVersion)
+        val (newQuestions, updatedQuestions) = processQuestions(request, existingQuestions, newSurveyVersion)
+
+        surveyQuestionRepository.saveAll(newQuestions)
+        surveyQuestionRepository.saveAll(updatedQuestions)
+
+        val allQuestions = newQuestions + updatedQuestions
+        val surveyQuestionOptions = createSurveyQuestionOptionsFromQuestions(request, allQuestions)
+        if (surveyQuestionOptions.isNotEmpty()) {
+            surveyQuestionOptionRepository.saveAll(surveyQuestionOptions)
+        }
+    }
+
+    @Transactional
+    fun updateQuestions(surveyId: Long, request: UpdateSurveyRequest) {
+        val survey = getSurveyById(surveyId)
+        val currentVersion = getCurrentSurveyVersion(survey)
+        val newSurveyVersion = createSurveyVersionEntity(survey)
+        surveyVersionRepository.save(newSurveyVersion)
+
+        val existingQuestions = surveyQuestionRepository.findBySurveyVersion(currentVersion)
+        val (newQuestions, updatedQuestions) = processQuestions(request, existingQuestions, newSurveyVersion)
+
+        surveyQuestionRepository.saveAll(newQuestions)
+        surveyQuestionRepository.saveAll(updatedQuestions)
+
+        val deletedQuestionIds = existingQuestions.map { it.id!! }.toSet() - newQuestions.map { it.id!! }.toSet() - updatedQuestions.map { it.id!! }.toSet()
+        if (deletedQuestionIds.isNotEmpty()) {
+            surveyQuestionRepository.markAsDeleted(deletedQuestionIds.toList(), LocalDateTime.now())
+        }
+
+        val allQuestions = newQuestions + updatedQuestions
+        val surveyQuestionOptions = createSurveyQuestionOptionsFromQuestions(request, allQuestions)
+        if (surveyQuestionOptions.isNotEmpty()) {
+            surveyQuestionOptionRepository.saveAll(surveyQuestionOptions)
+        }
+    }
+
+    @Transactional
+    fun deleteSingleQuestion(surveyId: Long, questionId: Long) {
+        val survey = getSurveyById(surveyId)
+        val currentVersion = getCurrentSurveyVersion(survey)
+        val newSurveyVersion = createSurveyVersionEntity(survey)
+        surveyVersionRepository.save(newSurveyVersion)
+
+        markQuestionAsDeleted(questionId)
+
+        val remainingQuestions = surveyQuestionRepository.findBySurveyVersion(currentVersion)
+        surveyQuestionRepository.saveAll(remainingQuestions)
+
+        val remainingOptions = remainingQuestions.flatMap { it.createOptions(emptyList()) }
+        if (remainingOptions.isNotEmpty()) {
+            surveyQuestionOptionRepository.saveAll(remainingOptions)
+        }
+    }
+
+    @Transactional
+    fun deleteMultipleQuestions(surveyId: Long, questionIds: List<Long>) {
+        val survey = getSurveyById(surveyId)
+        val currentVersion = getCurrentSurveyVersion(survey)
+        val newSurveyVersion = createSurveyVersionEntity(survey)
+        surveyVersionRepository.save(newSurveyVersion)
+
+        markQuestionsAsDeleted(questionIds)
+
+        val remainingQuestions = surveyQuestionRepository.findBySurveyVersion(currentVersion)
+        surveyQuestionRepository.saveAll(remainingQuestions)
+
+        val remainingOptions = remainingQuestions.flatMap { it.createOptions(emptyList()) }
+        if (remainingOptions.isNotEmpty()) {
+            surveyQuestionOptionRepository.saveAll(remainingOptions)
+        }
+    }
+
+
+    private fun createSurveyEntity(request: CreateSurveyRequest): Survey {
+        return Survey.create(request.name, request.description)
+    }
+
+    private fun createSurveyVersionEntity(survey: Survey): SurveyVersion {
+        return SurveyVersion.create(survey)
+    }
+
+    private fun createSurveyQuestions(request: CreateSurveyRequest, surveyVersion: SurveyVersion): List<SurveyQuestion> {
+        return request.questions.map { questionRequest ->
+            SurveyQuestion.create(
+                questionRequest.name,
+                questionRequest.description,
+                questionRequest.questionType,
+                questionRequest.isRequired,
+                surveyVersion
+            )
+        }
+    }
+
+    private fun createSurveyQuestionOptions(request: CreateSurveyRequest, surveyQuestions: List<SurveyQuestion>): List<SurveyQuestionOption> {
+        return surveyQuestions.flatMapIndexed { index, surveyQuestion ->
+            val questionRequest = request.questions[index]
+            surveyQuestion.createOptions(questionRequest.options)
+        }
+    }
+
+    private fun createSurveyQuestionOptionsFromQuestions(request: UpdateSurveyRequest, surveyQuestions: List<SurveyQuestion>): List<SurveyQuestionOption> {
+        return surveyQuestions.flatMap { question ->
+            val options = request.questions.find { it.id == question.id }?.options ?: emptyList()
+            question.createOptions(options)
+        }
+    }
+
+    private fun markQuestionAsDeleted(questionId: Long) {
+        surveyQuestionRepository.markAsDeleted(listOf(questionId), LocalDateTime.now())
+    }
+
+    private fun markQuestionsAsDeleted(questionIds: List<Long>) {
+        surveyQuestionRepository.markAsDeleted(questionIds, LocalDateTime.now())
+    }
+
+
+    private fun processQuestions(request: UpdateSurveyRequest, existingQuestions: List<SurveyQuestion>, newSurveyVersion: SurveyVersion): Pair<List<SurveyQuestion>, List<SurveyQuestion>> {
+        val existingQuestionIds = existingQuestions.map { it.id }.toSet()
+
+        val newQuestions = request.questions.filter { it.id == null }.map { questionRequest ->
+            SurveyQuestion.create(
+                questionRequest.name,
+                questionRequest.description,
+                questionRequest.questionType,
+                questionRequest.isRequired,
+                newSurveyVersion
+            )
+        }
+
+        val updatedQuestions = request.questions.filter { it.id != null }.mapNotNull { questionRequest ->
+            val existingQuestion = existingQuestions.find { it.id == questionRequest.id }
+            existingQuestion?.update(
+                questionRequest.name,
+                questionRequest.description,
+                questionRequest.questionType,
+                questionRequest.isRequired,
+                newSurveyVersion
+            )
+        }
+
+        return Pair(newQuestions, updatedQuestions)
+    }
+
+    private fun getSurveyById(surveyId: Long): Survey {
+        return surveyRepository.findById(surveyId).orElseThrow {
+            IllegalArgumentException("Survey with ID $surveyId does not exist.")
+        }
+    }
+
+    private fun getCurrentSurveyVersion(survey: Survey): SurveyVersion {
+        return surveyVersionRepository.findBySurvey(survey).lastOrNull()
+            ?: throw IllegalStateException("Current survey version not found.")
+    }
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
new file mode 100644
index 0000000..445076e
--- /dev/null
+++ b/src/main/resources/application.properties
@@ -0,0 +1,11 @@
+spring.application.name=survey
+# H2 Database Configuration
+spring.datasource.url=jdbc:h2:mem:testdb
+spring.datasource.driver-class-name=org.h2.Driver
+spring.datasource.username=sa
+spring.datasource.password=password
+spring.h2.console.enabled=true
+
+# JPA Configuration
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.show-sql=true
diff --git a/src/test/kotlin/innerCircle/survey/SurveyApplicationTests.kt b/src/test/kotlin/innerCircle/survey/SurveyApplicationTests.kt
new file mode 100644
index 0000000..0d53013
--- /dev/null
+++ b/src/test/kotlin/innerCircle/survey/SurveyApplicationTests.kt
@@ -0,0 +1,13 @@
+package innerCircle.survey
+
+import org.junit.jupiter.api.Test
+import org.springframework.boot.test.context.SpringBootTest
+
+@SpringBootTest
+class SurveyApplicationTests {
+
+	@Test
+	fun contextLoads() {
+	}
+
+}