diff --git a/.gitignore b/.gitignore
index 0c9d47c18..a8276640c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ build
 .gradle
 .idea
 *.iml
+ci/variables.yml
+out/
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 000000000..3fc38c7c6
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,29 @@
+plugins {
+    id 'org.springframework.boot' version '2.0.3.RELEASE'
+}
+
+apply plugin: 'java'
+apply plugin: 'io.spring.dependency-management'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile("org.springframework.boot:spring-boot-starter-web")
+    compile("org.springframework.boot:spring-boot-starter-data-jpa")
+    compile("org.springframework.boot:spring-boot-starter-actuator")
+    compile("mysql:mysql-connector-java")
+    compile("org.projectlombok:lombok")
+
+    testCompile("com.h2database:h2")
+    testCompile("org.springframework.boot:spring-boot-starter-test")
+}
+
+bootRun.environment([
+        "WELCOME_MESSAGE": "hello"
+])
+
+test.environment([
+        "WELCOME_MESSAGE": "Hello from test"
+])
\ 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..758de960e
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..16f4babeb
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Jul 24 10:06:40 EDT 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-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..86afcdd53
--- /dev/null
+++ b/manifest.yml
@@ -0,0 +1,11 @@
+---
+applications:
+- name: pal-tracker-bs
+  path: build/libs/pal-tracker.jar
+  buildpack: java_buildpack_offline
+  memory: 768M
+  disk_quota: 512M
+  services:
+  - tracker-database
+  env:
+    WELCOME_MESSAGE: "Hello from Cloud Foundry"
\ No newline at end of file
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..0b9af7c78
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/EnvController.java
@@ -0,0 +1,28 @@
+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 {
+    Map<String, String> env = new HashMap<>();
+
+    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 cfInstanceAddress) {
+        env.put("PORT", port);
+        env.put("MEMORY_LIMIT", memoryLimit);
+        env.put("CF_INSTANCE_INDEX", cfInstanceIndex);
+        env.put("CF_INSTANCE_ADDR", cfInstanceAddress);
+    }
+
+    @GetMapping("/env")
+    public Map<String, String> getEnv() {
+        return env;
+    }
+}
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..bca68874f
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java
@@ -0,0 +1,13 @@
+package io.pivotal.pal.tracker;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class PalTrackerApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(PalTrackerApplication.class, args);
+    }
+
+}
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..1fd779fb4
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/TimeEntry.java
@@ -0,0 +1,43 @@
+package io.pivotal.pal.tracker;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.time.LocalDate;
+
+@Data
+@Entity
+@Table(name = "time_entries")
+public class TimeEntry {
+    @Id
+    @GeneratedValue
+    private Long id;
+    private Long projectId;
+    private Long userId;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate date;
+    private Integer hours;
+
+    public TimeEntry() {
+        super();
+    }
+
+    public TimeEntry(long projectId, long userId, LocalDate date, int hours) {
+        this.projectId = projectId;
+        this.userId = userId;
+        this.date = date;
+        this.hours = hours;
+    }
+
+    public TimeEntry(Long id, Long projectId, Long userId, LocalDate date, Integer hours) {
+        this.id = id;
+        this.projectId = projectId;
+        this.userId = userId;
+        this.date = date;
+        this.hours = hours;
+    }
+}
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..ca1a65aee
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java
@@ -0,0 +1,71 @@
+package io.pivotal.pal.tracker;
+
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.MeterRegistry;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Optional;
+
+@RestController
+@RequestMapping("/time-entries")
+public class TimeEntryController {
+    private TimeEntryRepository repository;
+    private final Counter createCounter;
+    private final Counter readCounter;
+    private final Counter listCounter;
+    private final Counter updateCounter;
+    private final Counter deleteCounter;
+
+
+    public TimeEntryController(TimeEntryRepository repository, MeterRegistry registry) {
+        this.repository = repository;
+        this.createCounter = registry.counter("TimeEntry.created");
+        this.readCounter = registry.counter("TimeEntry.read");
+        this.listCounter = registry.counter("TimeEntry.listed");
+        this.updateCounter = registry.counter("TimeEntry.updated");
+        this.deleteCounter = registry.counter("TimeEntry.deleted");
+    }
+
+    @PostMapping
+    public ResponseEntity<TimeEntry> create(@RequestBody TimeEntry timeEntry) {
+        createCounter.increment();
+        return new ResponseEntity<>(repository.save(timeEntry), HttpStatus.CREATED);
+    }
+
+    @GetMapping("/{id}")
+    public ResponseEntity<TimeEntry> read(@PathVariable("id") Long id) {
+        Optional<TimeEntry> entry = repository.findById(id);
+        if (entry.isPresent()) {
+            readCounter.increment();
+            return new ResponseEntity<>(entry.get(), HttpStatus.OK);
+        }
+        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+    }
+
+    @GetMapping
+    public ResponseEntity<List<TimeEntry>> list() {
+        listCounter.increment();
+        return new ResponseEntity<>(repository.findAll(), HttpStatus.OK);
+    }
+
+    @PutMapping("/{id}")
+    public ResponseEntity<TimeEntry> update(@PathVariable("id") Long id, @RequestBody TimeEntry entry) {
+        entry.setId(id);
+        TimeEntry timeEntry = repository.save(entry);
+        if (timeEntry != null) {
+            updateCounter.increment();
+            return new ResponseEntity<>(timeEntry, HttpStatus.OK);
+        }
+        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<TimeEntry> delete(@PathVariable("id") Long id) {
+        repository.deleteById(id);
+        deleteCounter.increment();
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+}
diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntryHealthIndicator.java b/src/main/java/io/pivotal/pal/tracker/TimeEntryHealthIndicator.java
new file mode 100644
index 000000000..d26eb902e
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/TimeEntryHealthIndicator.java
@@ -0,0 +1,29 @@
+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
+public class TimeEntryHealthIndicator implements HealthIndicator {
+
+    private static final int MAX_TIME_ENTRIES = 5;
+    private final TimeEntryRepository repository;
+
+    public TimeEntryHealthIndicator(TimeEntryRepository timeEntryRepository) {
+        this.repository = timeEntryRepository;
+    }
+
+    @Override
+    public Health health() {
+        Health.Builder builder = new Health.Builder();
+
+        if(repository.findAll().size() < MAX_TIME_ENTRIES) {
+            builder.up();
+        } else {
+            builder.down();
+        }
+
+        return builder.build();
+    }
+}
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..d303875f6
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java
@@ -0,0 +1,6 @@
+package io.pivotal.pal.tracker;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface TimeEntryRepository extends JpaRepository<TimeEntry, Long>{
+}
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..b68d743b7
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/WelcomeController.java
@@ -0,0 +1,20 @@
+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 message;
+
+    public WelcomeController(@Value("${WELCOME_MESSAGE}") String message) {
+        this.message = message;
+    }
+
+    @GetMapping
+    public String sayHello() {
+        return message;
+    }
+}
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
new file mode 100644
index 000000000..24f86a27c
--- /dev/null
+++ b/src/main/resources/application-local.yml
@@ -0,0 +1,6 @@
+spring:
+  application:
+    name: pal-tracker
+  datasource:
+    username: root
+    url: "jdbc:mysql://localhost:3306/tracker_dev?autoReconnect=true&useSSL=false"
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
new file mode 100644
index 000000000..47550ed41
--- /dev/null
+++ b/src/main/resources/application.yml
@@ -0,0 +1,13 @@
+spring:
+  application:
+    name: pal-tracker
+  datasource:
+    platform: mysql
+management:
+  endpoint:
+    health:
+      show-details: always
+  endpoints:
+    web:
+      exposure:
+        include: "*"
\ No newline at end of file
diff --git a/src/main/resources/data-mysql.sql b/src/main/resources/data-mysql.sql
new file mode 100644
index 000000000..673f7a210
--- /dev/null
+++ b/src/main/resources/data-mysql.sql
@@ -0,0 +1 @@
+INSERT INTO time_entries VALUES (1,123,456, '2017-01-08',8);
\ No newline at end of file
diff --git a/src/main/resources/schema-mysql.sql b/src/main/resources/schema-mysql.sql
new file mode 100644
index 000000000..0109289a7
--- /dev/null
+++ b/src/main/resources/schema-mysql.sql
@@ -0,0 +1,12 @@
+DROP TABLE IF EXISTS time_entries;
+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/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/TestConfig.java b/src/test/java/test/pivotal/pal/tracker/TestConfig.java
new file mode 100644
index 000000000..ca3774013
--- /dev/null
+++ b/src/test/java/test/pivotal/pal/tracker/TestConfig.java
@@ -0,0 +1,23 @@
+package test.pivotal.pal.tracker;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.data.repository.init.Jackson2RepositoryPopulatorFactoryBean;
+
+@Configuration
+@Profile("!cloud")
+public class TestConfig {
+    @Bean
+    public Jackson2RepositoryPopulatorFactoryBean repositoryPopulator(ObjectMapper objectMapper) {
+        Resource sourceData = new ClassPathResource("data.json");
+        Jackson2RepositoryPopulatorFactoryBean factory = new Jackson2RepositoryPopulatorFactoryBean();
+        // Set a custom ObjectMapper if Jackson customization is needed
+        factory.setMapper(objectMapper);
+        factory.setResources(new Resource[] { sourceData });
+        return factory;
+    }
+}
\ No newline at end of file
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..f6d1cee90
--- /dev/null
+++ b/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java
@@ -0,0 +1,121 @@
+package test.pivotal.pal.tracker;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.MockClock;
+import io.micrometer.core.instrument.simple.SimpleConfig;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+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 java.util.Optional;
+
+import static java.util.Arrays.asList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.*;
+
+public class TimeEntryControllerTest {
+    private TimeEntryRepository timeEntryRepository;
+    private TimeEntryController controller;
+
+    @Before
+    public void setUp() throws Exception {
+        MeterRegistry meterRegistry = new SimpleMeterRegistry(SimpleConfig.DEFAULT, new MockClock());
+        timeEntryRepository = mock(TimeEntryRepository.class);
+        controller = new TimeEntryController(timeEntryRepository, meterRegistry);
+    }
+
+    @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)
+            .save(any(TimeEntry.class));
+
+
+        ResponseEntity response = controller.create(timeEntryToCreate);
+
+
+        verify(timeEntryRepository).save(timeEntryToCreate);
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.CREATED);
+        assertThat(response.getBody()).isEqualTo(expectedResult);
+    }
+
+    @Test
+    public void testRead() throws Exception {
+        Optional<TimeEntry> returned = Optional.of(new TimeEntry(1L, 123L, 456L, LocalDate.parse("2017-01-08"), 8));
+        doReturn(returned)
+            .when(timeEntryRepository)
+            .findById(1L);
+        TimeEntry expected = returned.get();
+        ResponseEntity<TimeEntry> response = controller.read(1L);
+
+        verify(timeEntryRepository).findById(1L);
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+        assertThat(response.getBody()).isEqualTo(expected);
+    }
+
+    @Test
+    public void testRead_NotFound() throws Exception {
+        doReturn(Optional.empty())
+            .when(timeEntryRepository)
+            .findById(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).findAll();
+
+        ResponseEntity<List<TimeEntry>> response = controller.list();
+
+        verify(timeEntryRepository).findAll();
+        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)
+            .save(any(TimeEntry.class));
+
+        ResponseEntity response = controller.update(1L, expected);
+
+        verify(timeEntryRepository).save(expected);
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+        assertThat(response.getBody()).isEqualTo(expected);
+    }
+
+    @Test
+    public void testUpdate_NotFound() throws Exception {
+        doReturn(null)
+            .when(timeEntryRepository)
+            .save(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).deleteById(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/HealthApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java
new file mode 100644
index 000000000..a55cfd8bc
--- /dev/null
+++ b/src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java
@@ -0,0 +1,37 @@
+package test.pivotal.pal.trackerapi;
+
+import com.jayway.jsonpath.DocumentContext;
+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.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.junit4.SpringRunner;
+
+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;
+
+    @Test
+    public void healthTest() {
+        ResponseEntity<String> response = this.restTemplate.getForEntity("/actuator/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("$.details.db.status", String.class)).isEqualTo("UP");
+        assertThat(healthJson.read("$.details.diskSpace.status", String.class)).isEqualTo("UP");
+    }
+}
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..35b427f98
--- /dev/null
+++ b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java
@@ -0,0 +1,120 @@
+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(123L, 456L, 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(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/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");
+    }
+}
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
new file mode 100644
index 000000000..2889d4543
--- /dev/null
+++ b/src/test/resources/application.yml
@@ -0,0 +1,14 @@
+spring:
+  application:
+    name: pal-tracker
+  datasource:
+    platform: h2
+management:
+  endpoint:
+    health:
+      show-details: always
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+WELCOME_MESSAGE: "Hello from test"
\ No newline at end of file
diff --git a/src/test/resources/data.json b/src/test/resources/data.json
new file mode 100644
index 000000000..31db0925e
--- /dev/null
+++ b/src/test/resources/data.json
@@ -0,0 +1,9 @@
+[
+  {
+    "_class" : "io.pivotal.pal.tracker.TimeEntry",
+    "projectId" : 123,
+    "userId" : 456
+    "date" : "2018-04-11",
+    "hours": 8
+  }
+]
\ No newline at end of file
diff --git a/src/test/resources/schema-h2b.sql b/src/test/resources/schema-h2b.sql
new file mode 100644
index 000000000..1db73c327
--- /dev/null
+++ b/src/test/resources/schema-h2b.sql
@@ -0,0 +1,7 @@
+CREATE TABLE time_entries (
+  id         INT PRIMARY KEY,
+  project_id INT,
+  user_id    INT,
+  date       DATE,
+  hours      INT,
+)
\ No newline at end of file