diff --git a/.gitignore b/.gitignore
index 0c9d47c18..282b5db4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ build
 .gradle
 .idea
 *.iml
+ci/variables.yml
+out/
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..8620b69c1
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,54 @@
+dist: trusty
+sudo: false
+notifications:
+  email: false
+env:
+  - RELEASE_TAG="release-$TRAVIS_BUILD_NUMBER"
+if: tag IS blank
+
+jobs:
+  include:
+    - stage: build and publish
+      language: java
+      jdk: oraclejdk8
+      addons:
+        mariadb: '10.2'
+      install: skip
+      before_script:
+        - mysql -uroot < databases/tracker/create_databases.sql
+        - curl https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.1.1/flyway-commandline-5.1.1-linux-x64.tar.gz | tar xvz
+        - flyway-*/flyway -url="jdbc:mysql://localhost:3306/tracker_test" -locations=filesystem:databases/tracker -user=tracker -password= clean migrate
+      script: ./gradlew clean build
+      before_deploy:
+        - git config --local user.name "Travis CI"
+        - git config --local user.email "travis@example.com"
+        - git tag -f $RELEASE_TAG
+      deploy:
+        provider: releases
+        api_key: $GITHUB_OAUTH_TOKEN
+        file: "build/libs/pal-tracker.jar"
+        skip_cleanup: true
+    - stage: deploy to review
+      language: java
+      before_install:
+        - wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo apt-key add -
+        - echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
+        - sudo apt-get update
+        - sudo apt-get install cf-cli
+        - sudo apt-get -y install jq
+        - curl https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.1.1/flyway-commandline-5.1.1-linux-x64.tar.gz | tar xvz
+      script:
+        - echo "Downloading $RELEASE_TAG"
+        - wget -P build/libs https://github.com/$GITHUB_USERNAME/pal-tracker/releases/download/$RELEASE_TAG/pal-tracker.jar
+      before_deploy:
+        - echo "Deploying $RELEASE_TAG to review"
+      after_success:
+        - cf login -a $CF_API_URL -u $CF_USERNAME -p $CF_PASSWORD -o $CF_ORG -s review
+        - scripts/migrate-databases.sh pal-tracker .
+      deploy:
+        provider: cloudfoundry
+        api: $CF_API_URL
+        username: $CF_USERNAME
+        password: $CF_PASSWORD
+        organization: $CF_ORG
+        space: review
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 000000000..dfbde8e92
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,90 @@
+import org.flywaydb.gradle.task.FlywayMigrateTask
+
+buildscript {
+    ext {
+        kotlinVersion = '1.2.51'
+        springBootVersion = '1.5.14.RELEASE'
+    }
+
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+        classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
+        classpath("org.jetbrains.kotlin:kotlin-allopen:${kotlinVersion}")
+    }
+}
+
+plugins {
+    id "org.flywaydb.flyway" version "4.2.0"
+}
+
+apply plugin: 'kotlin'
+apply plugin: 'kotlin-spring'
+apply plugin: 'org.springframework.boot'
+
+compileKotlin {
+    kotlinOptions {
+        freeCompilerArgs = ["-Xjsr305=strict"]
+        jvmTarget = "1.8"
+    }
+}
+
+compileTestKotlin {
+    kotlinOptions {
+        freeCompilerArgs = ["-Xjsr305=strict"]
+        jvmTarget = "1.8"
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile("org.springframework.boot:spring-boot-starter-web")
+    compile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
+    compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
+    compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.1")
+    compile("com.fasterxml.jackson.module:jackson-module-kotlin")
+    compile("org.springframework.boot:spring-boot-starter-jdbc")
+    compile("mysql:mysql-connector-java:6.0.6")
+    compile("org.springframework.boot:spring-boot-starter-actuator")
+    compile("org.springframework.boot:spring-boot-starter-security")
+
+    testCompile("org.springframework.boot:spring-boot-starter-test")
+    testCompile("org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion")
+}
+
+springBoot {
+    buildInfo()
+}
+
+def developmentDbUrl = "jdbc:mysql://localhost:3306/tracker_dev?user=tracker&useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false"
+bootRun.environment([
+        "WELCOME_MESSAGE": "hello",
+        "SPRING_DATASOURCE_URL": developmentDbUrl,
+        "MANAGEMENT_SECURITY_ENABLED": false,
+        "HTTPS_DISABLED": true,
+])
+
+def testDbUrl = "jdbc:mysql://localhost:3306/tracker_test?user=tracker&useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false"
+test.environment([
+        "WELCOME_MESSAGE": "Hello from test",
+        "SPRING_DATASOURCE_URL": testDbUrl,
+        "MANAGEMENT_SECURITY_ENABLED": false,
+        "HTTPS_DISABLED": true,
+])
+
+flyway {
+    url = developmentDbUrl
+    user = "tracker"
+    password = ""
+    locations = ["filesystem:databases/tracker/migrations"]
+}
+
+task testMigrate(type: FlywayMigrateTask) {
+    url = testDbUrl
+}
\ No newline at end of file
diff --git a/databases/tracker/create_databases.sql b/databases/tracker/create_databases.sql
new file mode 100644
index 000000000..a0674bdda
--- /dev/null
+++ b/databases/tracker/create_databases.sql
@@ -0,0 +1,10 @@
+DROP DATABASE IF EXISTS tracker_dev;
+DROP DATABASE IF EXISTS tracker_test;
+
+CREATE DATABASE tracker_dev;
+CREATE DATABASE tracker_test;
+
+CREATE USER IF NOT EXISTS 'tracker'@'localhost'
+  IDENTIFIED BY '';
+GRANT ALL PRIVILEGES ON tracker_dev.* TO 'tracker' @'localhost';
+GRANT ALL PRIVILEGES ON tracker_test.* TO 'tracker' @'localhost';
diff --git a/databases/tracker/migrations/V1__initial_schema.sql b/databases/tracker/migrations/V1__initial_schema.sql
new file mode 100644
index 000000000..daca8c4e3
--- /dev/null
+++ b/databases/tracker/migrations/V1__initial_schema.sql
@@ -0,0 +1,11 @@
+CREATE TABLE time_entries (
+  id         BIGINT(20) NOT NULL AUTO_INCREMENT,
+  project_id BIGINT(20),
+  user_id    BIGINT(20),
+  date       DATE,
+  hours      INT,
+
+  PRIMARY KEY (id)
+)
+  ENGINE = innodb
+  DEFAULT CHARSET = utf8;
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..0d4a95168
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 000000000..3fc765d7c
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Fri Jul 20 10:11:11 PDT 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 000000000..cccdd3d51
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# 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
+    ;;
+  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"
+    which java >/dev/null 2>&1 || 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
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 000000000..e95643d6a
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@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=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@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=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+: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 %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="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!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/manifest.yml b/manifest.yml
new file mode 100644
index 000000000..ef41fe5e7
--- /dev/null
+++ b/manifest.yml
@@ -0,0 +1,9 @@
+---
+applications:
+- name: pal-tracker
+  path: build/libs/pal-tracker.jar
+  buildpack: java_buildpack
+  routes:
+  - route: ah-pal-tracker-review.cfapps.io
+  env:
+    WELCOME_MESSAGE: Hello from the review environment
diff --git a/pal-tracker-codebase.txt b/pal-tracker-codebase.txt
deleted file mode 100644
index 0943c3cd3..000000000
--- a/pal-tracker-codebase.txt
+++ /dev/null
@@ -1 +0,0 @@
-pal-tracker codebase
diff --git a/scripts/migrate-databases.sh b/scripts/migrate-databases.sh
new file mode 100755
index 000000000..dcd50fae0
--- /dev/null
+++ b/scripts/migrate-databases.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+set -e
+
+
+app_guid=`cf app $1 --guid`
+credentials=`cf curl /v2/apps/$app_guid/env | jq '.system_env_json.VCAP_SERVICES' | jq '.["cleardb"][0].credentials'`
+
+ip_address=`echo $credentials | jq -r '.hostname'`
+db_name=`echo $credentials | jq -r '.name'`
+db_username=`echo $credentials | jq -r '.username'`
+db_password=`echo $credentials | jq -r '.password'`
+
+echo "Opening ssh tunnel to $ip_address"
+cf ssh -N -L 63306:$ip_address:3306 pal-tracker &
+cf_ssh_pid=$!
+
+echo "Waiting for tunnel"
+sleep 5
+
+flyway-*/flyway -url="jdbc:mysql://127.0.0.1:63306/$db_name" -locations=filesystem:$2/databases/tracker -user=$db_username -password=$db_password migrate
+
+kill -STOP $cf_ssh_pid
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 000000000..05c90d22c
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = "pal-tracker"
diff --git a/src/main/kotlin/io/pivotal/pal/tracker/EnvController.kt b/src/main/kotlin/io/pivotal/pal/tracker/EnvController.kt
new file mode 100644
index 000000000..106841959
--- /dev/null
+++ b/src/main/kotlin/io/pivotal/pal/tracker/EnvController.kt
@@ -0,0 +1,22 @@
+package io.pivotal.pal.tracker
+
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+class EnvController(
+        @Value("\${PORT:NOT SET}") private val port: String,
+        @Value("\${MEMORY_LIMIT:NOT SET}") private val memoryLimit: String,
+        @Value("\${CF_INSTANCE_INDEX:NOT SET}") private val cfInstanceIndex: String,
+        @Value("\${CF_INSTANCE_ADDR:NOT SET}") private val cfInstanceAddr: String
+) {
+    @GetMapping("/env")
+    fun getEnv() =
+            mapOf(
+                    "PORT" to port,
+                    "MEMORY_LIMIT" to memoryLimit,
+                    "CF_INSTANCE_INDEX" to cfInstanceIndex,
+                    "CF_INSTANCE_ADDR" to cfInstanceAddr
+            )
+}
\ No newline at end of file
diff --git a/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt b/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt
new file mode 100644
index 000000000..2b91895a2
--- /dev/null
+++ b/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt
@@ -0,0 +1,26 @@
+package io.pivotal.pal.tracker
+
+class InMemoryTimeEntryRepository: TimeEntryRepository {
+    private val timeEntries = mutableMapOf<Long, TimeEntry>()
+    private var nextId = 1L
+
+    override fun create(timeEntry: TimeEntry): TimeEntry {
+        val createdTimeEntry = timeEntry.copy(id=nextId++)
+        timeEntries[createdTimeEntry.id!!] = (createdTimeEntry)
+        return createdTimeEntry
+    }
+
+    override fun find(id: Long) = timeEntries[id]
+
+    override fun list() = timeEntries.values.toList()
+
+    override fun update(id: Long, timeEntry: TimeEntry): TimeEntry {
+        val updatedTimeEntry = timeEntry.copy(id=id)
+        timeEntries[updatedTimeEntry.id!!] = updatedTimeEntry
+        return updatedTimeEntry
+    }
+
+    override fun delete(id: Long) {
+       timeEntries.remove(id)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/io/pivotal/pal/tracker/JdbcTimeEntryRepository.kt b/src/main/kotlin/io/pivotal/pal/tracker/JdbcTimeEntryRepository.kt
new file mode 100644
index 000000000..3f7d43b82
--- /dev/null
+++ b/src/main/kotlin/io/pivotal/pal/tracker/JdbcTimeEntryRepository.kt
@@ -0,0 +1,80 @@
+package io.pivotal.pal.tracker
+
+import org.springframework.jdbc.core.JdbcTemplate
+import org.springframework.jdbc.core.ResultSetExtractor
+import org.springframework.jdbc.core.RowMapper
+import org.springframework.jdbc.support.GeneratedKeyHolder
+import java.sql.Date
+import java.sql.ResultSet
+import java.sql.Statement.RETURN_GENERATED_KEYS
+import javax.sql.DataSource
+
+class JdbcTimeEntryRepository(dataSource: DataSource) : TimeEntryRepository {
+    private val jdbcTemplate: JdbcTemplate = JdbcTemplate(dataSource)
+
+    private val mapper: RowMapper<TimeEntry> = RowMapper { rs, _ ->
+        TimeEntry(
+                rs.getLong("id"),
+                rs.getLong("project_id"),
+                rs.getLong("user_id"),
+                rs.getDate("date").toLocalDate(),
+                rs.getInt("hours")
+        )
+    }
+
+    private val extractor: ResultSetExtractor<TimeEntry?> = ResultSetExtractor { rs: ResultSet ->
+        if (rs.next())
+            mapper.mapRow(rs, 1)
+        else
+            null
+    }
+
+    override fun create(timeEntry: TimeEntry): TimeEntry {
+        val generatedKeyHolder = GeneratedKeyHolder()
+
+        jdbcTemplate.update({ connection ->
+            val statement = connection.prepareStatement(
+                    "INSERT INTO time_entries (project_id, user_id, date, hours) VALUES (?, ?, ?, ?)",
+                    RETURN_GENERATED_KEYS
+            )
+
+            statement.setLong(1, timeEntry.projectId)
+            statement.setLong(2, timeEntry.userId)
+            statement.setDate(3, Date.valueOf(timeEntry.date))
+            statement.setInt(4, timeEntry.hours)
+
+            statement
+        }, generatedKeyHolder)
+
+        return find(generatedKeyHolder.key.toLong())!!
+    }
+
+    override fun find(id: Long): TimeEntry? {
+        return jdbcTemplate.query(
+                "SELECT id, project_id, user_id, date, hours FROM time_entries WHERE id = ?", arrayOf(id), extractor)
+    }
+
+    override fun list(): List<TimeEntry> {
+        return jdbcTemplate.query(
+                "SELECT id, project_id, user_id, date, hours FROM time_entries", mapper)
+    }
+
+    override fun update(id: Long, timeEntry: TimeEntry): TimeEntry? {
+        jdbcTemplate.update("""
+                UPDATE time_entries
+                SET project_id = ?, user_id = ?, date = ?,  hours = ?
+                WHERE id = ?
+                """,
+                timeEntry.projectId,
+                timeEntry.userId,
+                Date.valueOf(timeEntry.date),
+                timeEntry.hours,
+                id)
+
+        return find(id)
+    }
+
+    override fun delete(id: Long) {
+        jdbcTemplate.update("DELETE FROM time_entries WHERE id = ?", id)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/io/pivotal/pal/tracker/PalTrackerApplication.kt b/src/main/kotlin/io/pivotal/pal/tracker/PalTrackerApplication.kt
new file mode 100644
index 000000000..86859c758
--- /dev/null
+++ b/src/main/kotlin/io/pivotal/pal/tracker/PalTrackerApplication.kt
@@ -0,0 +1,32 @@
+package io.pivotal.pal.tracker
+
+import org.springframework.boot.SpringApplication
+import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.context.annotation.Bean
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
+import com.fasterxml.jackson.annotation.JsonInclude
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.SerializationFeature
+import com.fasterxml.jackson.module.kotlin.KotlinModule
+import javax.sql.DataSource
+
+
+@SpringBootApplication
+class PalTrackerApplication {
+    @Bean
+    fun timeEntryRepository(dataSource: DataSource) : TimeEntryRepository = JdbcTimeEntryRepository(dataSource)
+
+    @Bean
+    fun jsonObjectMapper(): ObjectMapper =
+            Jackson2ObjectMapperBuilder.json()
+                    .serializationInclusion(JsonInclude.Include.NON_NULL) // Don’t include null values
+                    .featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) //ISODate
+                    .modules(JavaTimeModule(), KotlinModule())
+                    .build()
+
+}
+
+fun main(args: Array<String>) {
+    SpringApplication.run(PalTrackerApplication::class.java, *args)
+}
diff --git a/src/main/kotlin/io/pivotal/pal/tracker/SecurityConfiguration.kt b/src/main/kotlin/io/pivotal/pal/tracker/SecurityConfiguration.kt
new file mode 100644
index 000000000..3f3b7a105
--- /dev/null
+++ b/src/main/kotlin/io/pivotal/pal/tracker/SecurityConfiguration.kt
@@ -0,0 +1,32 @@
+package io.pivotal.pal.tracker
+
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.security.config.annotation.web.builders.HttpSecurity
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder
+
+@EnableWebSecurity
+class SecurityConfiguration(
+        @Value("\${https.disabled}") private val httpsDisabled: Boolean) : WebSecurityConfigurerAdapter() {
+
+    override fun configure(http: HttpSecurity) {
+        if (!httpsDisabled) {
+            http.requiresChannel().anyRequest().requiresSecure()
+        }
+
+        http.authorizeRequests()
+                .antMatchers("/**").hasRole("USER")
+                .and()
+                .httpBasic()
+                .and()
+                .csrf().disable()
+    }
+
+    override fun configure(auth: AuthenticationManagerBuilder) {
+        auth.inMemoryAuthentication()
+                .withUser("user")
+                .password("password")
+                .roles("USER")
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntry.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntry.kt
new file mode 100644
index 000000000..94f7f5ea1
--- /dev/null
+++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntry.kt
@@ -0,0 +1,18 @@
+package io.pivotal.pal.tracker
+
+import java.time.LocalDate
+
+data class TimeEntry(
+        val id: Long?,
+        val projectId: Long,
+        val userId: Long,
+        val date: LocalDate,
+        val hours: Int
+) {
+    constructor(
+            projectId: Long,
+            userId: Long,
+            date: LocalDate,
+            hours: Int
+    ) : this(null, projectId, userId, date, hours)
+}
\ No newline at end of file
diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt
new file mode 100644
index 000000000..271fc1fca
--- /dev/null
+++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt
@@ -0,0 +1,57 @@
+package io.pivotal.pal.tracker
+
+import org.springframework.boot.actuate.metrics.CounterService
+import org.springframework.boot.actuate.metrics.GaugeService
+import org.springframework.http.HttpStatus
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.*
+
+@RestController
+class TimeEntryController(
+        private val timeEntryRepository: TimeEntryRepository,
+        private val counterService: CounterService,
+        private val gaugeService: GaugeService) {
+
+    @PostMapping("/time-entries")
+    fun create(@RequestBody timeEntry: TimeEntry): ResponseEntity<TimeEntry> {
+        counterService.increment("TimeEntry.created")
+        gaugeService.submit("timeEntries.count", timeEntryRepository.list().size.toDouble())
+        return ResponseEntity(timeEntryRepository.create(timeEntry), HttpStatus.CREATED)
+    }
+
+    @GetMapping("/time-entries/{id}")
+    fun read(@PathVariable id: Long): ResponseEntity<TimeEntry?> {
+        val timeEntry = timeEntryRepository.find(id)
+        return if (timeEntry != null) {
+            counterService.increment("TimeEntry.read")
+            ResponseEntity(timeEntry, HttpStatus.OK)
+        } else {
+            ResponseEntity(HttpStatus.NOT_FOUND)
+        }
+    }
+
+    @GetMapping("/time-entries")
+    fun list(): ResponseEntity<List<TimeEntry>> {
+        counterService.increment("TimeEntry.listed")
+        return ResponseEntity(timeEntryRepository.list(), HttpStatus.OK)
+    }
+
+    @PutMapping("/time-entries/{id}")
+    fun update(@PathVariable id: Long, @RequestBody timeEntry: TimeEntry): ResponseEntity<TimeEntry> {
+        val updatedTimeEntry = timeEntryRepository.update(id, timeEntry)
+        return if (updatedTimeEntry != null) {
+            counterService.increment("TimeEntry.updated")
+            ResponseEntity(updatedTimeEntry, HttpStatus.OK)
+        } else {
+            ResponseEntity(HttpStatus.NOT_FOUND)
+        }
+    }
+
+    @DeleteMapping("/time-entries/{id}")
+    fun delete(@PathVariable id: Long): ResponseEntity<Void> {
+        counterService.increment("TimeEntry.deleted");
+        gaugeService.submit("timeEntries.count", timeEntryRepository.list().size.toDouble())
+        timeEntryRepository.delete(id)
+        return ResponseEntity(HttpStatus.NO_CONTENT)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryHealthIndicator.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryHealthIndicator.kt
new file mode 100644
index 000000000..ef7fac77c
--- /dev/null
+++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryHealthIndicator.kt
@@ -0,0 +1,16 @@
+package io.pivotal.pal.tracker
+
+import org.springframework.boot.actuate.health.Health
+import org.springframework.boot.actuate.health.HealthIndicator
+import org.springframework.stereotype.Component
+
+@Component
+class TimeEntryHealthIndicator(private val timeEntryRepository: TimeEntryRepository) : HealthIndicator {
+    override fun health(): Health {
+        return if (timeEntryRepository.list().size < 5) {
+            Health.up().build()
+        } else {
+            Health.down().build()
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt
new file mode 100644
index 000000000..a8ced9613
--- /dev/null
+++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt
@@ -0,0 +1,13 @@
+package io.pivotal.pal.tracker
+
+interface TimeEntryRepository {
+    fun create(timeEntry: TimeEntry) : TimeEntry
+
+    fun find(id: Long) : TimeEntry?
+
+    fun list() : List<TimeEntry>
+
+    fun update(id: Long, timeEntry: TimeEntry) : TimeEntry?
+
+    fun delete(id: Long)
+}
\ No newline at end of file
diff --git a/src/main/kotlin/io/pivotal/pal/tracker/WelcomeController.kt b/src/main/kotlin/io/pivotal/pal/tracker/WelcomeController.kt
new file mode 100644
index 000000000..c22d21f84
--- /dev/null
+++ b/src/main/kotlin/io/pivotal/pal/tracker/WelcomeController.kt
@@ -0,0 +1,11 @@
+package io.pivotal.pal.tracker
+
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+class WelcomeController(@Value("\${WELCOME_MESSAGE}") private val welcomeMessage: String) {
+    @GetMapping("/")
+    fun sayWelcomeMessage() = welcomeMessage
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
new file mode 100644
index 000000000..383ef7df5
--- /dev/null
+++ b/src/main/resources/application.properties
@@ -0,0 +1 @@
+https.disabled=false
\ No newline at end of file
diff --git a/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java b/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java
new file mode 100644
index 000000000..d0ae6cbe6
--- /dev/null
+++ b/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java
@@ -0,0 +1,71 @@
+package test.pivotal.pal.tracker;
+
+import io.pivotal.pal.tracker.InMemoryTimeEntryRepository;
+import io.pivotal.pal.tracker.TimeEntry;
+import org.junit.Test;
+
+import java.time.LocalDate;
+import java.util.List;
+
+import static java.util.Arrays.asList;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class InMemoryTimeEntryRepositoryTest {
+    @Test
+    public void create() throws Exception {
+        InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository();
+        TimeEntry createdTimeEntry = repo.create(new TimeEntry(123L, 456L, LocalDate.parse("2017-01-08"), 8));
+
+        TimeEntry expected = new TimeEntry(1L, 123L, 456L, LocalDate.parse("2017-01-08"), 8);
+        assertThat(createdTimeEntry).isEqualTo(expected);
+
+        TimeEntry readEntry = repo.find(createdTimeEntry.getId());
+        assertThat(readEntry).isEqualTo(expected);
+    }
+
+    @Test
+    public void find() throws Exception {
+        InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository();
+        repo.create(new TimeEntry(123L, 456L, LocalDate.parse("2017-01-08"), 8));
+
+        TimeEntry expected = new TimeEntry(1L, 123L, 456L, LocalDate.parse("2017-01-08"), 8);
+        TimeEntry readEntry = repo.find(1L);
+        assertThat(readEntry).isEqualTo(expected);
+    }
+
+    @Test
+    public void list() throws Exception {
+        InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository();
+        repo.create(new TimeEntry(123L, 456L, LocalDate.parse("2017-01-08"), 8));
+        repo.create(new TimeEntry(789L, 654L, LocalDate.parse("2017-01-07"), 4));
+
+        List<TimeEntry> expected = asList(
+                new TimeEntry(1L, 123L, 456L, LocalDate.parse("2017-01-08"), 8),
+                new TimeEntry(2L, 789L, 654L, LocalDate.parse("2017-01-07"), 4)
+        );
+        assertThat(repo.list()).isEqualTo(expected);
+    }
+
+    @Test
+    public void update() throws Exception {
+        InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository();
+        TimeEntry created = repo.create(new TimeEntry(123L, 456L, LocalDate.parse("2017-01-08"), 8));
+
+        TimeEntry updatedEntry = repo.update(
+                created.getId(),
+                new TimeEntry(321L, 654L, LocalDate.parse("2017-01-09"), 5));
+
+        TimeEntry expected = new TimeEntry(created.getId(), 321L, 654L, LocalDate.parse("2017-01-09"), 5);
+        assertThat(updatedEntry).isEqualTo(expected);
+        assertThat(repo.find(created.getId())).isEqualTo(expected);
+    }
+
+    @Test
+    public void delete() throws Exception {
+        InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository();
+        TimeEntry created = repo.create(new TimeEntry(123L, 456L, LocalDate.parse("2017-01-08"), 8));
+
+        repo.delete(created.getId());
+        assertThat(repo.list()).isEmpty();
+    }
+}
diff --git a/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java b/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java
new file mode 100644
index 000000000..e1eac20fc
--- /dev/null
+++ b/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java
@@ -0,0 +1,159 @@
+package test.pivotal.pal.tracker;
+
+
+import com.mysql.cj.jdbc.MysqlDataSource;
+import io.pivotal.pal.tracker.JdbcTimeEntryRepository;
+import io.pivotal.pal.tracker.TimeEntry;
+import io.pivotal.pal.tracker.TimeEntryRepository;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+import java.sql.Date;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class JdbcTimeEntryRepositoryTest {
+    private TimeEntryRepository subject;
+    private JdbcTemplate jdbcTemplate;
+
+    @Before
+    public void setUp() throws Exception {
+        MysqlDataSource dataSource = new MysqlDataSource();
+        dataSource.setUrl(System.getenv("SPRING_DATASOURCE_URL"));
+
+        subject = new JdbcTimeEntryRepository(dataSource);
+
+        jdbcTemplate = new JdbcTemplate(dataSource);
+        jdbcTemplate.execute("DELETE FROM time_entries");
+
+        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+    }
+
+    @Test
+    public void createInsertsATimeEntryRecord() throws Exception {
+        TimeEntry newTimeEntry = new TimeEntry(123, 321, LocalDate.parse("2017-01-09"), 8);
+        TimeEntry entry = subject.create(newTimeEntry);
+
+        Map<String, Object> foundEntry = jdbcTemplate.queryForMap("Select * from time_entries where id = ?", entry.getId());
+
+        assertThat(foundEntry.get("id")).isEqualTo(entry.getId());
+        assertThat(foundEntry.get("project_id")).isEqualTo(123L);
+        assertThat(foundEntry.get("user_id")).isEqualTo(321L);
+        assertThat(((Date)foundEntry.get("date")).toLocalDate()).isEqualTo(LocalDate.parse("2017-01-09"));
+        assertThat(foundEntry.get("hours")).isEqualTo(8);
+    }
+
+    @Test
+    public void createReturnsTheCreatedTimeEntry() throws Exception {
+        TimeEntry newTimeEntry = new TimeEntry(123, 321, LocalDate.parse("2017-01-09"), 8);
+        TimeEntry entry = subject.create(newTimeEntry);
+
+        assertThat(entry.getId()).isNotNull();
+        assertThat(entry.getProjectId()).isEqualTo(123);
+        assertThat(entry.getUserId()).isEqualTo(321);
+        assertThat(entry.getDate()).isEqualTo(LocalDate.parse("2017-01-09"));
+        assertThat(entry.getHours()).isEqualTo(8);
+    }
+
+    @Test
+    public void findFindsATimeEntry() throws Exception {
+        jdbcTemplate.execute(
+            "INSERT INTO time_entries (id, project_id, user_id, date, hours) " +
+                "VALUES (999, 123, 321, '2017-01-09', 8)"
+        );
+
+        TimeEntry timeEntry = subject.find(999L);
+
+        assertThat(timeEntry.getId()).isEqualTo(999L);
+        assertThat(timeEntry.getProjectId()).isEqualTo(123L);
+        assertThat(timeEntry.getUserId()).isEqualTo(321L);
+        assertThat(timeEntry.getDate()).isEqualTo(LocalDate.parse("2017-01-09"));
+        assertThat(timeEntry.getHours()).isEqualTo(8);
+    }
+
+    @Test
+    public void findReturnsNullWhenNotFound() throws Exception {
+        TimeEntry timeEntry = subject.find(999L);
+
+        assertThat(timeEntry).isNull();
+    }
+
+    @Test
+    public void listFindsAllTimeEntries() throws Exception {
+        jdbcTemplate.execute(
+            "INSERT INTO time_entries (id, project_id, user_id, date, hours) " +
+                "VALUES (999, 123, 321, '2017-01-09', 8), (888, 456, 678, '2017-01-08', 9)"
+        );
+
+        List<TimeEntry> timeEntries = subject.list();
+        assertThat(timeEntries.size()).isEqualTo(2);
+
+        TimeEntry timeEntry = timeEntries.get(0);
+        assertThat(timeEntry.getId()).isEqualTo(888L);
+        assertThat(timeEntry.getProjectId()).isEqualTo(456L);
+        assertThat(timeEntry.getUserId()).isEqualTo(678L);
+        assertThat(timeEntry.getDate()).isEqualTo(LocalDate.parse("2017-01-08"));
+        assertThat(timeEntry.getHours()).isEqualTo(9);
+
+        timeEntry = timeEntries.get(1);
+        assertThat(timeEntry.getId()).isEqualTo(999L);
+        assertThat(timeEntry.getProjectId()).isEqualTo(123L);
+        assertThat(timeEntry.getUserId()).isEqualTo(321L);
+        assertThat(timeEntry.getDate()).isEqualTo(LocalDate.parse("2017-01-09"));
+        assertThat(timeEntry.getHours()).isEqualTo(8);
+    }
+
+    @Test
+    public void updateReturnsTheUpdatedRecord() throws Exception {
+        jdbcTemplate.execute(
+            "INSERT INTO time_entries (id, project_id, user_id, date, hours) " +
+                "VALUES (1000, 123, 321, '2017-01-09', 8)");
+
+        TimeEntry timeEntryUpdates = new TimeEntry(456, 987, LocalDate.parse("2017-01-10"), 10);
+
+        TimeEntry updatedTimeEntry = subject.update(1000L, timeEntryUpdates);
+
+        assertThat(updatedTimeEntry.getId()).isEqualTo(1000L);
+        assertThat(updatedTimeEntry.getProjectId()).isEqualTo(456L);
+        assertThat(updatedTimeEntry.getUserId()).isEqualTo(987L);
+        assertThat(updatedTimeEntry.getDate()).isEqualTo(LocalDate.parse("2017-01-10"));
+        assertThat(updatedTimeEntry.getHours()).isEqualTo(10);
+    }
+
+    @Test
+    public void updateUpdatesTheRecord() throws Exception {
+        jdbcTemplate.execute(
+            "INSERT INTO time_entries (id, project_id, user_id, date, hours) " +
+                "VALUES (1000, 123, 321, '2017-01-09', 8)");
+
+        TimeEntry updatedTimeEntry = new TimeEntry(456, 322, LocalDate.parse("2017-01-10"), 10);
+
+        TimeEntry timeEntry = subject.update(1000L, updatedTimeEntry);
+
+        Map<String, Object> foundEntry = jdbcTemplate.queryForMap("Select * from time_entries where id = ?", timeEntry.getId());
+
+        assertThat(foundEntry.get("id")).isEqualTo(timeEntry.getId());
+        assertThat(foundEntry.get("project_id")).isEqualTo(456L);
+        assertThat(foundEntry.get("user_id")).isEqualTo(322L);
+        assertThat(((Date)foundEntry.get("date")).toLocalDate()).isEqualTo(LocalDate.parse("2017-01-10"));
+        assertThat(foundEntry.get("hours")).isEqualTo(10);
+    }
+
+    @Test
+    public void deleteRemovesTheRecord() throws Exception {
+        jdbcTemplate.execute(
+            "INSERT INTO time_entries (id, project_id, user_id, date, hours) " +
+                "VALUES (999, 123, 321, '2017-01-09', 8)"
+        );
+
+        subject.delete(999L);
+
+        Map<String, Object> foundEntry = jdbcTemplate.queryForMap("Select count(*) count from time_entries where id = ?", 999);
+        assertThat(foundEntry.get("count")).isEqualTo(0L);
+    }
+}
diff --git a/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java b/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java
new file mode 100644
index 000000000..55ff3da99
--- /dev/null
+++ b/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java
@@ -0,0 +1,118 @@
+package test.pivotal.pal.tracker;
+
+import io.pivotal.pal.tracker.TimeEntry;
+import io.pivotal.pal.tracker.TimeEntryController;
+import io.pivotal.pal.tracker.TimeEntryRepository;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.boot.actuate.metrics.CounterService;
+import org.springframework.boot.actuate.metrics.GaugeService;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.time.LocalDate;
+import java.util.List;
+
+import static java.util.Arrays.asList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.*;
+
+public class TimeEntryControllerTest {
+    private TimeEntryRepository timeEntryRepository;
+    private TimeEntryController controller;
+
+    @Before
+    public void setUp() throws Exception {
+        timeEntryRepository = mock(TimeEntryRepository.class);
+        controller = new TimeEntryController(timeEntryRepository, mock(CounterService.class), mock(GaugeService.class));
+    }
+
+    @Test
+    public void testCreate() throws Exception {
+        TimeEntry timeEntryToCreate = new TimeEntry(123L, 456L, LocalDate.parse("2017-01-08"), 8);
+        TimeEntry expectedResult = new TimeEntry(1L, 123L, 456L, LocalDate.parse("2017-01-08"), 8);
+        doReturn(expectedResult)
+            .when(timeEntryRepository)
+            .create(any(TimeEntry.class));
+
+
+        ResponseEntity response = controller.create(timeEntryToCreate);
+
+
+        verify(timeEntryRepository).create(timeEntryToCreate);
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.CREATED);
+        assertThat(response.getBody()).isEqualTo(expectedResult);
+    }
+
+    @Test
+    public void testRead() throws Exception {
+        TimeEntry expected = new TimeEntry(1L, 123L, 456L, LocalDate.parse("2017-01-08"), 8);
+        doReturn(expected)
+            .when(timeEntryRepository)
+            .find(1L);
+
+        ResponseEntity<TimeEntry> response = controller.read(1L);
+
+        verify(timeEntryRepository).find(1L);
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+        assertThat(response.getBody()).isEqualTo(expected);
+    }
+
+    @Test
+    public void testRead_NotFound() throws Exception {
+        doReturn(null)
+            .when(timeEntryRepository)
+            .find(1L);
+
+        ResponseEntity<TimeEntry> response = controller.read(1L);
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
+    }
+
+    @Test
+    public void testList() throws Exception {
+        List<TimeEntry> expected = asList(
+            new TimeEntry(1L, 123L, 456L, LocalDate.parse("2017-01-08"), 8),
+            new TimeEntry(2L, 789L, 321L, LocalDate.parse("2017-01-07"), 4)
+        );
+        doReturn(expected).when(timeEntryRepository).list();
+
+        ResponseEntity<List<TimeEntry>> response = controller.list();
+
+        verify(timeEntryRepository).list();
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+        assertThat(response.getBody()).isEqualTo(expected);
+    }
+
+    @Test
+    public void testUpdate() throws Exception {
+        TimeEntry expected = new TimeEntry(1L, 987L, 654L, LocalDate.parse("2017-01-07"), 4);
+        doReturn(expected)
+            .when(timeEntryRepository)
+            .update(eq(1L), any(TimeEntry.class));
+
+        ResponseEntity response = controller.update(1L, expected);
+
+        verify(timeEntryRepository).update(1L, expected);
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+        assertThat(response.getBody()).isEqualTo(expected);
+    }
+
+    @Test
+    public void testUpdate_NotFound() throws Exception {
+        doReturn(null)
+            .when(timeEntryRepository)
+            .update(eq(1L), any(TimeEntry.class));
+
+        ResponseEntity response = controller.update(1L, new TimeEntry(987L, 654L, LocalDate.parse("2017-01-07"), 4));
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
+    }
+
+    @Test
+    public void testDelete() throws Exception {
+        ResponseEntity<Void> response = controller.delete(1L);
+        verify(timeEntryRepository).delete(1L);
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT);
+    }
+}
diff --git a/src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java
new file mode 100644
index 000000000..b88ccc304
--- /dev/null
+++ b/src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java
@@ -0,0 +1,61 @@
+package test.pivotal.pal.trackerapi;
+
+import com.jayway.jsonpath.DocumentContext;
+import com.mysql.cj.jdbc.MysqlDataSource;
+import io.pivotal.pal.tracker.PalTrackerApplication;
+import io.pivotal.pal.tracker.TimeEntry;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.time.LocalDate;
+import java.util.TimeZone;
+
+import static com.jayway.jsonpath.JsonPath.parse;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT)
+public class HealthApiTest {
+
+    @Autowired
+    private TestRestTemplate restTemplate;
+
+    @LocalServerPort
+    private String port;
+
+    @Before
+    public void setUp() throws Exception {
+        RestTemplateBuilder builder = new RestTemplateBuilder()
+                .rootUri("http://localhost:" + port)
+                .basicAuthorization("user", "password");
+
+        restTemplate = new TestRestTemplate(builder);
+    }
+
+    @Test
+    public void healthTest() throws InterruptedException {
+        ResponseEntity<String> response = this.restTemplate.getForEntity("/health", String.class);
+
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+
+        DocumentContext healthJson = parse(response.getBody());
+
+        assertThat(healthJson.read("$.status", String.class)).isEqualTo("UP");
+        assertThat(healthJson.read("$.timeEntry.status", String.class)).isEqualTo("UP");
+        assertThat(healthJson.read("$.db.status", String.class)).isEqualTo("UP");
+        assertThat(healthJson.read("$.diskSpace.status", String.class)).isEqualTo("UP");
+    }
+}
diff --git a/src/test/java/test/pivotal/pal/trackerapi/SecurityApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/SecurityApiTest.java
new file mode 100644
index 000000000..72099994b
--- /dev/null
+++ b/src/test/java/test/pivotal/pal/trackerapi/SecurityApiTest.java
@@ -0,0 +1,52 @@
+package test.pivotal.pal.trackerapi;
+
+import io.pivotal.pal.tracker.PalTrackerApplication;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT)
+public class SecurityApiTest {
+
+    @LocalServerPort
+    private String port;
+    private TestRestTemplate authorizedRestTemplate;
+
+    @Autowired
+    private TestRestTemplate unAuthorizedRestTemplate;
+
+    @Before
+    public void setUp() throws Exception {
+        RestTemplateBuilder builder = new RestTemplateBuilder()
+            .rootUri("http://localhost:" + port)
+            .basicAuthorization("user", "password");
+
+        authorizedRestTemplate = new TestRestTemplate(builder);
+    }
+
+    @Test
+    public void unauthorizedTest() {
+        ResponseEntity<String> response = this.unAuthorizedRestTemplate.getForEntity("/", String.class);
+
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED);
+    }
+
+    @Test
+    public void authorizedTest() {
+        ResponseEntity<String> response = this.authorizedRestTemplate.getForEntity("/", String.class);
+
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+    }
+}
diff --git a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java
new file mode 100644
index 000000000..a097a53b5
--- /dev/null
+++ b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java
@@ -0,0 +1,152 @@
+package test.pivotal.pal.trackerapi;
+
+import com.jayway.jsonpath.DocumentContext;
+import com.mysql.cj.jdbc.MysqlDataSource;
+import io.pivotal.pal.tracker.PalTrackerApplication;
+import io.pivotal.pal.tracker.TimeEntry;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.time.LocalDate;
+import java.util.Collection;
+import java.util.TimeZone;
+
+import static com.jayway.jsonpath.JsonPath.parse;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT)
+public class TimeEntryApiTest {
+
+    @Autowired
+    private TestRestTemplate restTemplate;
+
+    private TimeEntry timeEntry = new TimeEntry(123L, 456L, LocalDate.parse("2017-01-08"), 8);
+
+    @LocalServerPort
+    private String port;
+
+    @Before
+    public void setUp() throws Exception {
+        RestTemplateBuilder builder = new RestTemplateBuilder()
+                .rootUri("http://localhost:" + port)
+                .basicAuthorization("user", "password");
+
+        restTemplate = new TestRestTemplate(builder);
+
+        MysqlDataSource dataSource = new MysqlDataSource();
+        dataSource.setUrl(System.getenv("SPRING_DATASOURCE_URL"));
+
+        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+        jdbcTemplate.execute("TRUNCATE time_entries");
+
+        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+    }
+
+    @Test
+    public void testCreate() throws Exception {
+        ResponseEntity<String> createResponse = restTemplate.postForEntity("/time-entries", timeEntry, String.class);
+
+
+        assertThat(createResponse.getStatusCode()).isEqualTo(HttpStatus.CREATED);
+
+        DocumentContext createJson = parse(createResponse.getBody());
+        assertThat(createJson.read("$.id", Long.class)).isGreaterThan(0);
+        assertThat(createJson.read("$.projectId", Long.class)).isEqualTo(123L);
+        assertThat(createJson.read("$.userId", Long.class)).isEqualTo(456L);
+        assertThat(createJson.read("$.date", String.class)).isEqualTo("2017-01-08");
+        assertThat(createJson.read("$.hours", Long.class)).isEqualTo(8);
+    }
+
+    @Test
+    public void testList() throws Exception {
+        Long id = createTimeEntry();
+
+
+        ResponseEntity<String> listResponse = restTemplate.getForEntity("/time-entries", String.class);
+
+
+        assertThat(listResponse.getStatusCode()).isEqualTo(HttpStatus.OK);
+
+        DocumentContext listJson = parse(listResponse.getBody());
+
+        Collection timeEntries = listJson.read("$[*]", Collection.class);
+        assertThat(timeEntries.size()).isEqualTo(1);
+
+        Long readId = listJson.read("$[0].id", Long.class);
+        assertThat(readId).isEqualTo(id);
+    }
+
+    @Test
+    public void testRead() throws Exception {
+        Long id = createTimeEntry();
+
+
+        ResponseEntity<String> readResponse = this.restTemplate.getForEntity("/time-entries/" + id, String.class);
+
+
+        assertThat(readResponse.getStatusCode()).isEqualTo(HttpStatus.OK);
+        DocumentContext readJson = parse(readResponse.getBody());
+        assertThat(readJson.read("$.id", Long.class)).isEqualTo(id);
+        assertThat(readJson.read("$.projectId", Long.class)).isEqualTo(123L);
+        assertThat(readJson.read("$.userId", Long.class)).isEqualTo(456L);
+        assertThat(readJson.read("$.date", String.class)).isEqualTo("2017-01-08");
+        assertThat(readJson.read("$.hours", Long.class)).isEqualTo(8);
+    }
+
+    @Test
+    public void testUpdate() throws Exception {
+        Long id = createTimeEntry();
+        TimeEntry updatedTimeEntry = new TimeEntry(2L, 3L, LocalDate.parse("2017-01-09"), 9);
+
+
+        ResponseEntity<String> updateResponse = restTemplate.exchange("/time-entries/" + id, HttpMethod.PUT, new HttpEntity<>(updatedTimeEntry, null), String.class);
+
+
+        assertThat(updateResponse.getStatusCode()).isEqualTo(HttpStatus.OK);
+
+        DocumentContext updateJson = parse(updateResponse.getBody());
+        assertThat(updateJson.read("$.id", Long.class)).isEqualTo(id);
+        assertThat(updateJson.read("$.projectId", Long.class)).isEqualTo(2L);
+        assertThat(updateJson.read("$.userId", Long.class)).isEqualTo(3L);
+        assertThat(updateJson.read("$.date", String.class)).isEqualTo("2017-01-09");
+        assertThat(updateJson.read("$.hours", Long.class)).isEqualTo(9);
+    }
+
+    @Test
+    public void testDelete() throws Exception {
+        Long id = createTimeEntry();
+
+
+        ResponseEntity<String> deleteResponse = restTemplate.exchange("/time-entries/" + id, HttpMethod.DELETE, null, String.class);
+
+
+        assertThat(deleteResponse.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT);
+
+        ResponseEntity<String> deletedReadResponse = this.restTemplate.getForEntity("/time-entries/" + id, String.class);
+        assertThat(deletedReadResponse.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
+    }
+
+    private Long createTimeEntry() {
+        HttpEntity<TimeEntry> entity = new HttpEntity<>(timeEntry);
+
+        ResponseEntity<TimeEntry> response = restTemplate.exchange("/time-entries", HttpMethod.POST, entity, TimeEntry.class);
+
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.CREATED);
+
+        return response.getBody().getId();
+    }
+}
diff --git a/src/test/kotlin/test/pivotal/pal/tracker/EnvControllerTest.kt b/src/test/kotlin/test/pivotal/pal/tracker/EnvControllerTest.kt
new file mode 100644
index 000000000..7050e3e69
--- /dev/null
+++ b/src/test/kotlin/test/pivotal/pal/tracker/EnvControllerTest.kt
@@ -0,0 +1,25 @@
+package test.pivotal.pal.tracker
+
+import org.junit.Test
+import io.pivotal.pal.tracker.EnvController
+
+import org.assertj.core.api.Assertions.assertThat
+
+class EnvControllerTest {
+    @Test
+    fun getEnv() {
+        val controller = EnvController(
+                "8675",
+                "12G",
+                "34",
+                "123.sesame.street"
+        )
+
+        val env = controller.getEnv()
+
+        assertThat(env["PORT"]).isEqualTo("8675")
+        assertThat(env["MEMORY_LIMIT"]).isEqualTo("12G")
+        assertThat(env["CF_INSTANCE_INDEX"]).isEqualTo("34")
+        assertThat(env["CF_INSTANCE_ADDR"]).isEqualTo("123.sesame.street")
+    }
+}
diff --git a/src/test/kotlin/test/pivotal/pal/tracker/WelcomeControllerTest.kt b/src/test/kotlin/test/pivotal/pal/tracker/WelcomeControllerTest.kt
new file mode 100644
index 000000000..e2972de7d
--- /dev/null
+++ b/src/test/kotlin/test/pivotal/pal/tracker/WelcomeControllerTest.kt
@@ -0,0 +1,15 @@
+package test.pivotal.pal.tracker
+
+import io.pivotal.pal.tracker.WelcomeController
+import org.junit.Test
+
+import org.assertj.core.api.Assertions.assertThat
+
+class WelcomeControllerTest {
+    @Test
+    fun itSaysHello() {
+        val controller = WelcomeController("A welcome message")
+
+        assertThat(controller.sayWelcomeMessage()).isEqualTo("A welcome message")
+    }
+}
diff --git a/src/test/kotlin/test/pivotal/pal/trackerapi/WelcomeApiTest.kt b/src/test/kotlin/test/pivotal/pal/trackerapi/WelcomeApiTest.kt
new file mode 100644
index 000000000..49467d5d9
--- /dev/null
+++ b/src/test/kotlin/test/pivotal/pal/trackerapi/WelcomeApiTest.kt
@@ -0,0 +1,41 @@
+package test.pivotal.pal.trackerapi
+
+import io.pivotal.pal.tracker.PalTrackerApplication
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.boot.test.web.client.TestRestTemplate
+import org.springframework.test.context.junit4.SpringRunner
+
+import org.assertj.core.api.Assertions.assertThat
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT
+import org.springframework.boot.web.client.RestTemplateBuilder
+import org.junit.Before
+import org.springframework.boot.context.embedded.LocalServerPort
+
+@RunWith(SpringRunner::class)
+@SpringBootTest(classes = [(PalTrackerApplication::class)], webEnvironment = RANDOM_PORT)
+class WelcomeApiTest {
+
+    @LocalServerPort
+    private val port: String? = null
+
+    @Autowired
+    private var restTemplate: TestRestTemplate? = null
+
+    @Before
+    fun setUp() {
+        val builder = RestTemplateBuilder()
+                .rootUri("http://localhost:$port")
+                .basicAuthorization("user", "password")
+
+        restTemplate = TestRestTemplate(builder)
+    }
+
+    @Test
+    fun exampleTest() {
+        val body = restTemplate!!.getForObject("/", String::class.java)
+        assertThat(body).isEqualTo("Hello from test")
+    }
+}