diff --git a/.gitignore b/.gitignore
index 0c9d47c18..5940ab48e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@ build
 .gradle
 .idea
 *.iml
+out
+sshKeyLoc
+ci/variables.yml
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 000000000..04e9f9a8d
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,22 @@
+plugins {
+    id "java"
+    id "org.springframework.boot" version "1.5.9.RELEASE"
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile("org.springframework.boot:spring-boot-starter-web")
+    testCompile("org.springframework.boot:spring-boot-starter-test")
+    compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.1")
+}
+
+bootRun.environment([
+        "WELCOME_MESSAGE": "hello",
+])
+
+test.environment([
+        "WELCOME_MESSAGE": "Hello from test",
+])
\ No newline at end of file
diff --git a/ci/build.yml b/ci/build.yml
new file mode 100644
index 000000000..4ba28db53
--- /dev/null
+++ b/ci/build.yml
@@ -0,0 +1,24 @@
+platform: linux
+
+image_resource:
+  type: docker-image
+  source:
+    repository: openjdk
+    tag: '8-jdk'
+
+inputs:
+  - name: pal-tracker
+  - name: version
+
+outputs:
+  - name: build-output
+
+run:
+  path: bash
+  args:
+  - -exc
+  - |
+    cd pal-tracker
+    chmod +x gradlew
+    ./gradlew -P version=$(cat ../version/number) build
+    cp build/libs/pal-tracker-*.jar ../build-output
diff --git a/ci/migrateDatabase.yml b/ci/migrateDatabase.yml
new file mode 100644
index 000000000..b2af8c5ef
--- /dev/null
+++ b/ci/migrateDatabase.yml
@@ -0,0 +1,29 @@
+platform: linux
+
+image_resource:
+  type: docker-image
+  source:
+    repository: openjdk
+    tag: '8-jdk'
+
+inputs:
+  - name: pal-tracker
+#  - name: version
+
+#outputs:
+#  - name: build-output
+
+run:
+  path: bash
+  args:
+  - -exc
+  - |
+    cd pal-tracker
+    curl -L "https://packages.cloudfoundry.org/stable?release=linux64-binary&source=github" | tar -zx
+    chmod +x cf
+    curl -L "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.0.5/flyway-commandline-5.0.5-linux-x64.tar.gz" | tar -zx
+    chmod +x flyway-5.0.5/flyway
+    ./cf login -a $CF_API_URL -u $CF_USERNAME -p $CF_PASSWORD -o $CF_ORG -s $CF_SPACE
+    ./cf ssh -N -L 63306:$MYSQL_IP:3306 pal-tracker &
+    sleep 2
+    ./flyway-5.0.5/flyway -url="jdbc:mysql://127.0.0.1:63306/$DATABASE_NAME" -locations=filesystem:databases/tracker -user=$DATABASE_USERNAME -password=$DATABASE_PASSWORD clean migrate
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
new file mode 100644
index 000000000..0d408ef95
--- /dev/null
+++ b/ci/pipeline.yml
@@ -0,0 +1,109 @@
+---
+resources:
+- name: pal-tracker
+  type: git
+  source:
+    uri: {{github-repository}}
+    branch: master
+    private_key: {{github-private-key}}
+
+- name: pal-tracker-artifacts
+  type: s3
+  source:
+    bucket: {{aws-bucket}}
+    regexp: releases/pal-tracker-(.*).jar
+    access_key_id: {{aws-access-key-id}}
+    secret_access_key: {{aws-secret-access-key}}
+
+- name: version
+  type: semver
+  source:
+    bucket: {{aws-bucket}}
+    key: pal-tracker/version
+    access_key_id: {{aws-access-key-id}}
+    secret_access_key: {{aws-secret-access-key}}
+
+- name: review-deployment
+  type: cf
+  source:
+    api: {{cf-api-url}}
+    username: {{cf-username}}
+    password: {{cf-password}}
+    organization: {{cf-org}}
+    space: review
+
+- name: production-deployment
+  type: cf
+  source:
+    api: {{cf-api-url}}
+    username: {{cf-username}}
+    password: {{cf-password}}
+    organization: {{cf-org}}
+    space: production
+
+jobs:
+- name: build
+  plan:
+  - get: pal-tracker
+    trigger: true
+  - get: version
+    params: {bump: patch}
+  - task: build and test
+    file: pal-tracker/ci/build.yml
+  - put: pal-tracker-artifacts
+    params:
+      file: build-output/pal-tracker-*.jar
+  - put: version
+    params:
+      file: version/number
+
+- name: deploy-review
+  plan:
+  - get: pal-tracker
+    passed: [build]
+  - get: pal-tracker-artifacts
+    trigger: true
+    passed: [build]
+  - task: migrate database
+    file: pal-tracker/ci/migrateDatabase.yml
+    params:
+      CF_API_URL: {{cf-api-url}}
+      CF_USERNAME: {{cf-username}}
+      CF_PASSWORD: {{cf-password}}
+      CF_ORG: {{cf-org}}
+      CF_SPACE: review
+      MYSQL_IP: {{mysql-ip}}
+      DATABASE_NAME: {{review-database-name}}
+      DATABASE_USERNAME: {{review-database-username}}
+      DATABASE_PASSWORD: {{review-database-password}}
+  - put: review-deployment
+    params:
+      manifest: pal-tracker/manifest-review.yml
+      path: pal-tracker-artifacts/pal-tracker-*.jar
+      environment_variables:
+        WELCOME_MESSAGE: "Hello from the review environment"
+
+- name: deploy-production
+  plan:
+  - get: pal-tracker
+    passed: [deploy-review]
+  - get: pal-tracker-artifacts
+    passed: [deploy-review]
+  - task: migrate database
+    file: pal-tracker/ci/migrateDatabase.yml
+    params:
+      CF_API_URL: {{cf-api-url}}
+      CF_USERNAME: {{cf-username}}
+      CF_PASSWORD: {{cf-password}}
+      CF_ORG: {{cf-org}}
+      CF_SPACE: production
+      MYSQL_IP: {{mysql-ip}}
+      DATABASE_NAME: {{production-database-name}}
+      DATABASE_USERNAME: {{production-database-username}}
+      DATABASE_PASSWORD: {{production-database-password}}
+  - put: production-deployment
+    params:
+      manifest: pal-tracker/manifest-production.yml
+      path: pal-tracker-artifacts/pal-tracker-*.jar
+      environment_variables:
+        WELCOME_MESSAGE: "Hello from the production environment"
\ 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..6f1e86abf
--- /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';
\ No newline at end of file
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..6b6ea3ab4
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..0e680f375
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.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-production.yml b/manifest-production.yml
new file mode 100644
index 000000000..70922be49
--- /dev/null
+++ b/manifest-production.yml
@@ -0,0 +1,5 @@
+---
+applications:
+- name: pal-tracker
+  path: build/libs/pal-tracker.jar
+  host: jb-pal-tracker-production
diff --git a/manifest-review.yml b/manifest-review.yml
new file mode 100644
index 000000000..3e256e842
--- /dev/null
+++ b/manifest-review.yml
@@ -0,0 +1,5 @@
+---
+applications:
+- name: pal-tracker
+  path: build/libs/pal-tracker.jar
+  host: jb-pal-tracker-review
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/settings.gradle b/settings.gradle
new file mode 100644
index 000000000..ef961960e
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = "pal-tracker"
\ No newline at end of file
diff --git a/src/main/java/io/pivotal/pal/tracker/EnvController.java b/src/main/java/io/pivotal/pal/tracker/EnvController.java
new file mode 100644
index 000000000..06df0e7d0
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/EnvController.java
@@ -0,0 +1,40 @@
+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;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+public class EnvController {
+
+    private String port;
+
+    private String memoryLimit;
+
+    private String cfInstanceIndex;
+
+    private String cfInstanceAddr;
+
+    public EnvController(@Value("${PORT:NOT SET}") String port, @Value("${MEMORY_LIMIT:NOT SET}") String memoryLimit, @Value("${CF_INSTANCE_INDEX:NOT SET}") String cfInstanceIndex, @Value("${CF_INSTANCE_ADDR:NOT SET}") String cfInstanceAddr) {
+        this.port = port;
+        this.memoryLimit = memoryLimit;
+        this.cfInstanceIndex = cfInstanceIndex;
+        this.cfInstanceAddr = cfInstanceAddr;
+    }
+
+    @GetMapping("/env")
+    public Map<String, String> getEnv() {
+        Map<String, String> env = new HashMap<>();
+
+        env.put("PORT", port);
+        env.put("MEMORY_LIMIT", memoryLimit);
+        env.put("CF_INSTANCE_INDEX", cfInstanceIndex);
+        env.put("CF_INSTANCE_ADDR", cfInstanceAddr);
+
+        return env;
+    }
+}
diff --git a/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java b/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java
new file mode 100644
index 000000000..107510c1c
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java
@@ -0,0 +1,75 @@
+package io.pivotal.pal.tracker;
+
+import org.springframework.stereotype.Repository;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public class InMemoryTimeEntryRepository implements TimeEntryRepository {
+
+
+    private Map<Long, TimeEntry> repoMap = new HashMap<>();
+
+
+    @Override
+    public TimeEntry create(TimeEntry timeEntry) {
+
+        long nextId = getNextId();
+        timeEntry.setId(nextId);
+        repoMap.put(nextId, timeEntry);
+        return timeEntry;
+    }
+
+    @Override
+    public TimeEntry find(long timeEntryId) {
+        return repoMap.get(timeEntryId);
+    }
+
+    @Override
+    public List<TimeEntry> list() {
+        List<TimeEntry> results = new ArrayList<>();
+        for (TimeEntry entry: repoMap.values()) {
+            results.add(entry);
+        }
+        return results;
+    }
+
+    @Override
+    public TimeEntry update(long timeEntryId, TimeEntry timeEntry) {
+        TimeEntry entry = repoMap.get(timeEntryId);
+
+        if (entry != null) {
+            // update the entry
+            entry.setHours(timeEntry.getHours());
+            entry.setProjectId(timeEntry.getProjectId());
+            entry.setDate(timeEntry.getDate());
+            entry.setUserId(timeEntry.getUserId());
+        }
+
+
+        return entry;
+    }
+
+    @Override
+    public void delete(long timeEntryId) {
+        repoMap.remove(timeEntryId);
+    }
+
+    public long getNextId() {
+        long id = 0;
+
+        for (long key : repoMap.keySet()) {
+            if (key > id) {
+                id = key;
+            }
+        }
+
+        id++;
+
+        return id;
+    }
+}
diff --git a/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java b/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java
new file mode 100644
index 000000000..65fad5d0f
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java
@@ -0,0 +1,32 @@
+package io.pivotal.pal.tracker;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+
+@SpringBootApplication
+public class PalTrackerApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(PalTrackerApplication.class, args);
+    }
+
+    @Bean
+    public TimeEntryRepository timeEntryRepository() {
+        return new InMemoryTimeEntryRepository();
+    }
+
+    @Bean
+    public ObjectMapper jsonObjectMapper() {
+        return Jackson2ObjectMapperBuilder.json()
+                .serializationInclusion(JsonInclude.Include.NON_NULL) // Don’t include null values
+                .featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) //ISODate
+                .modules(new JavaTimeModule())
+                .build();
+    }
+}
diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntry.java b/src/main/java/io/pivotal/pal/tracker/TimeEntry.java
new file mode 100644
index 000000000..63515b41c
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/TimeEntry.java
@@ -0,0 +1,88 @@
+package io.pivotal.pal.tracker;
+
+import java.time.LocalDate;
+
+public class TimeEntry {
+
+    private long id;
+    private long projectId;
+    private long userId;
+    private LocalDate date;
+    private int hours;
+
+    public TimeEntry(long id, long projectId, long userId, LocalDate date, int hours) {
+        this.id = id;
+        this.projectId = projectId;
+        this.userId = userId;
+        this.date = date;
+        this.hours = hours;
+    }
+
+    public TimeEntry(long projectId, long userId , LocalDate date, int hours) {
+
+        this.projectId = projectId;
+        this.userId = userId;
+        this.date = date;
+        this.hours = hours;
+    }
+
+    public TimeEntry() {
+
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(long projectId) {
+        this.projectId = projectId;
+    }
+
+    public long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(long userId) {
+        this.userId = userId;
+    }
+
+    public LocalDate getDate() {
+        return date;
+    }
+
+    public void setDate(LocalDate date) {
+        this.date = date;
+    }
+
+    public int getHours() {
+        return hours;
+    }
+
+    public void setHours(int hours) {
+        this.hours = hours;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        boolean result = false;
+
+
+        if (o != null && o instanceof TimeEntry) {
+            TimeEntry that = (TimeEntry) o;
+
+            if (that.getId() == this.getId()) {
+                result = true;
+            }
+        }
+
+        return result;
+    }
+}
diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java b/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java
new file mode 100644
index 000000000..f8c5f99cd
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java
@@ -0,0 +1,73 @@
+package io.pivotal.pal.tracker;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.websocket.server.PathParam;
+import java.util.List;
+
+@RestController
+public class TimeEntryController {
+
+    TimeEntryRepository timeEntryRepository;
+
+    public TimeEntryController(@Autowired TimeEntryRepository timeEntryRepository) {
+        this.timeEntryRepository = timeEntryRepository;
+    }
+
+    @PostMapping(value="/time-entries")
+    public @ResponseBody ResponseEntity create(@RequestBody TimeEntry timeEntry) {
+
+        TimeEntry newTimeEntry = timeEntryRepository.create(timeEntry);
+
+        return new ResponseEntity<TimeEntry>(newTimeEntry, HttpStatus.CREATED);
+    }
+
+    @GetMapping(value = "/time-entries/{id}")
+    public @ResponseBody ResponseEntity<TimeEntry> read(@PathVariable("id") Long id) {
+
+        TimeEntry timeEntry = timeEntryRepository.find(id);
+
+        if (timeEntry != null) {
+
+            return new ResponseEntity<TimeEntry>(timeEntry, HttpStatus.OK);
+        } else {
+            return new ResponseEntity<TimeEntry>((TimeEntry)null, HttpStatus.NOT_FOUND);
+        }
+    }
+
+    @GetMapping(value = "/time-entries")
+    public @ResponseBody ResponseEntity<List<TimeEntry>> list() {
+        List<TimeEntry> results = timeEntryRepository.list();
+
+        return new ResponseEntity<List<TimeEntry>>(results, HttpStatus.OK);
+    }
+
+
+    @PutMapping(value="/time-entries/{id}")
+    public @ResponseBody ResponseEntity update(@PathVariable("id") Long id, @RequestBody TimeEntry timeEntry) {
+
+        TimeEntry updatedTimeEntry = timeEntryRepository.update(id, timeEntry);
+
+        if (updatedTimeEntry != null) {
+
+            return new ResponseEntity<TimeEntry>(updatedTimeEntry, HttpStatus.OK);
+
+        } else {
+            return new ResponseEntity<TimeEntry>(timeEntry, HttpStatus.NOT_FOUND);
+        }
+    }
+
+    @DeleteMapping(value="/time-entries/{id}")
+    public @ResponseBody ResponseEntity<TimeEntry> delete(@PathVariable("id") Long id) {
+
+        TimeEntry deletedTimeEntry = timeEntryRepository.find(id);
+
+        timeEntryRepository.delete(id);
+
+        return new ResponseEntity<TimeEntry>(deletedTimeEntry, HttpStatus.NO_CONTENT);
+
+    }
+}
diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java b/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java
new file mode 100644
index 000000000..c28e3fbba
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java
@@ -0,0 +1,16 @@
+package io.pivotal.pal.tracker;
+
+import java.util.List;
+
+public interface TimeEntryRepository  {
+
+    public TimeEntry create(TimeEntry timeEntry);
+
+    public TimeEntry find(long timeEntryId);
+
+    public List<TimeEntry> list();
+
+    public TimeEntry update(long timeEntryId, TimeEntry timeEntry);
+
+    public void delete(long timeEntryId);
+}
diff --git a/src/main/java/io/pivotal/pal/tracker/WelcomeController.java b/src/main/java/io/pivotal/pal/tracker/WelcomeController.java
new file mode 100644
index 000000000..532b1290d
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/WelcomeController.java
@@ -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
+public class WelcomeController {
+
+
+    private String welcomeMessage;
+
+    public WelcomeController(@Value("${WELCOME_MESSAGE}") String welcomeMessage) {
+        this.welcomeMessage = welcomeMessage;
+    }
+
+    @GetMapping("/")
+    public String sayHello() {
+        return welcomeMessage;
+    }
+
+}
diff --git a/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java b/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java
new file mode 100644
index 000000000..fda0f0f34
--- /dev/null
+++ b/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java
@@ -0,0 +1,28 @@
+package test.pivotal.pal.tracker;
+
+import org.junit.Test;
+
+import java.util.Map;
+import io.pivotal.pal.tracker.EnvController;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class EnvControllerTest {
+    @Test
+    public void getEnv() throws Exception {
+        EnvController controller = new EnvController(
+            "8675",
+            "12G",
+            "34",
+            "123.sesame.street"
+        );
+
+        Map<String, String> env = controller.getEnv();
+
+        assertThat(env.get("PORT")).isEqualTo("8675");
+        assertThat(env.get("MEMORY_LIMIT")).isEqualTo("12G");
+        assertThat(env.get("CF_INSTANCE_INDEX")).isEqualTo("34");
+        assertThat(env.get("CF_INSTANCE_ADDR")).isEqualTo("123.sesame.street");
+    }
+
+}
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..31a7ffb71
--- /dev/null
+++ b/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java
@@ -0,0 +1,76 @@
+package test.pivotal.pal.tracker;
+
+import io.pivotal.pal.tracker.TimeEntryRepository;
+import io.pivotal.pal.tracker.InMemoryTimeEntryRepository;
+import io.pivotal.pal.tracker.TimeEntry;
+import org.junit.Test;
+import org.junit.runners.Parameterized;
+
+import java.time.LocalDate;
+import java.util.Collection;
+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 {
+        TimeEntryRepository repo = new InMemoryTimeEntryRepository();
+        TimeEntry createdTimeEntry = repo.create(new TimeEntry(123, 456, LocalDate.parse("2017-01-08"), 8));
+
+        TimeEntry expected = new TimeEntry(1L, 123, 456, 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 {
+        TimeEntryRepository repo = new InMemoryTimeEntryRepository();
+        repo.create(new TimeEntry(123, 456, LocalDate.parse("2017-01-08"), 8));
+
+        TimeEntry expected = new TimeEntry(1L, 123, 456, LocalDate.parse("2017-01-08"), 8);
+        TimeEntry readEntry = repo.find(1L);
+        assertThat(readEntry).isEqualTo(expected);
+    }
+
+    @Test
+    public void list() throws Exception {
+        TimeEntryRepository repo = new InMemoryTimeEntryRepository();
+        repo.create(new TimeEntry(123, 456, LocalDate.parse("2017-01-08"), 8));
+        repo.create(new TimeEntry(789, 654, LocalDate.parse("2017-01-07"), 4));
+
+        List<TimeEntry> expected = asList(
+                new TimeEntry(1L, 123, 456, LocalDate.parse("2017-01-08"), 8),
+                new TimeEntry(2L, 789, 654, LocalDate.parse("2017-01-07"), 4)
+        );
+        assertThat(repo.list()).isEqualTo(expected);
+    }
+
+    @Test
+    public void update() throws Exception {
+        TimeEntryRepository repo = new InMemoryTimeEntryRepository();
+        TimeEntry created = repo.create(new TimeEntry(123, 456, LocalDate.parse("2017-01-08"), 8));
+
+        TimeEntry updatedEntry = repo.update(
+                created.getId(),
+                new TimeEntry(321, 654, LocalDate.parse("2017-01-09"), 5));
+
+        TimeEntry expected = new TimeEntry(created.getId(), 321, 654, LocalDate.parse("2017-01-09"), 5);
+        assertThat(updatedEntry).isEqualTo(expected);
+        assertThat(repo.find(created.getId())).isEqualTo(expected);
+    }
+
+    @Test
+    public void delete() throws Exception {
+        TimeEntryRepository repo = new InMemoryTimeEntryRepository();
+        TimeEntry created = repo.create(new TimeEntry(123, 456, LocalDate.parse("2017-01-08"), 8));
+
+        repo.delete(created.getId());
+        assertThat(repo.list()).isEmpty();
+    }
+}
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..36247257a
--- /dev/null
+++ b/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java
@@ -0,0 +1,107 @@
+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.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);
+    }
+
+    @Test
+    public void testCreate() throws Exception {
+        TimeEntry expected = new TimeEntry(1L, 123, 456, LocalDate.parse("2017-01-08"), 8);
+        doReturn(expected)
+                .when(timeEntryRepository)
+                .create(any(TimeEntry.class));
+
+        ResponseEntity response = controller.create(new TimeEntry(123, 456, LocalDate.parse("2017-01-08"), 8));
+
+
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.CREATED);
+        assertThat(response.getBody()).isEqualTo(expected);
+    }
+
+    @Test
+    public void testRead() throws Exception {
+        TimeEntry expected = new TimeEntry(1L, 123, 456, LocalDate.parse("2017-01-08"), 8);
+        doReturn(expected)
+                .when(timeEntryRepository)
+                .find(1L);
+
+        ResponseEntity<TimeEntry> response = controller.read(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(1, 123, 456, LocalDate.parse("2017-01-08"), 8),
+                new TimeEntry(2, 789, 321, LocalDate.parse("2017-01-07"), 4)
+        );
+        doReturn(expected).when(timeEntryRepository).list();
+
+        ResponseEntity<List<TimeEntry>> response = controller.list();
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+        assertThat(response.getBody()).isEqualTo(expected);
+    }
+
+    @Test
+    public void testUpdate() throws Exception {
+        TimeEntry expected = new TimeEntry(1, 987, 654, LocalDate.parse("2017-01-07"), 4);
+        doReturn(expected)
+                .when(timeEntryRepository)
+                .update(eq(1L), any(TimeEntry.class));
+
+        ResponseEntity response = controller.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());
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
+    }
+
+    @Test
+    public void testDelete() throws Exception {
+        ResponseEntity<TimeEntry> response = controller.delete(1L);
+        verify(timeEntryRepository).delete(1L);
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT);
+    }
+}
diff --git a/src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.java b/src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.java
new file mode 100644
index 000000000..bfa8271a0
--- /dev/null
+++ b/src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.java
@@ -0,0 +1,16 @@
+package test.pivotal.pal.tracker;
+
+import io.pivotal.pal.tracker.WelcomeController;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class WelcomeControllerTest {
+
+    @Test
+    public void itSaysHello() throws Exception {
+        WelcomeController controller = new WelcomeController("A welcome message");
+
+        assertThat(controller.sayHello()).isEqualTo("A welcome message");
+    }
+}
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..b742e5447
--- /dev/null
+++ b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java
@@ -0,0 +1,126 @@
+package test.pivotal.pal.trackerapi;
+
+import com.jayway.jsonpath.DocumentContext;
+import io.pivotal.pal.tracker.PalTrackerApplication;
+import io.pivotal.pal.tracker.TimeEntry;
+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.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.time.LocalDate;
+import java.util.Collection;
+
+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(123, 456, LocalDate.parse("2017-01-08"), 8);
+
+    @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(2, 3, 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/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java
new file mode 100644
index 000000000..cc7091ed4
--- /dev/null
+++ b/src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java
@@ -0,0 +1,26 @@
+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 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 WelcomeApiTest {
+
+    @Autowired
+    private TestRestTemplate restTemplate;
+
+    @Test
+    public void exampleTest() {
+        String body = this.restTemplate.getForObject("/", String.class);
+        assertThat(body).isEqualTo("Hello from test");
+    }
+}