diff --git a/.gitignore b/.gitignore
index 0c9d47c18..4fa332f5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ build
 .gradle
 .idea
 *.iml
+ci/variables.yml
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 000000000..64c81fc43
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,21 @@
+plugins {
+    id "java"
+    id "org.springframework.boot" version "1.5.4.RELEASE"
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile("org.springframework.boot:spring-boot-starter-web")
+    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/ci/build.yml b/ci/build.yml
new file mode 100644
index 000000000..4c72d2f54
--- /dev/null
+++ b/ci/build.yml
@@ -0,0 +1,23 @@
+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
+    ./gradlew -P version=$(cat ../version/number) build
+    cp build/libs/pal-tracker-*.jar ../build-output
\ No newline at end of file
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
new file mode 100644
index 000000000..c34c3b2a9
--- /dev/null
+++ b/ci/pipeline.yml
@@ -0,0 +1,83 @@
+---
+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
+  - get: pal-tracker-artifacts
+    trigger: true
+    passed: [build]
+  - 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
+  - get: pal-tracker-artifacts
+    passed: [deploy-review]
+  - 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/ci/variables.example.yml b/ci/variables.example.yml
new file mode 100644
index 000000000..ff31e8218
--- /dev/null
+++ b/ci/variables.example.yml
@@ -0,0 +1,60 @@
+cf-api-url:  https://api.sys.longs.pal.pivotal.io
+cf-username: ganeshbabu.rajan2@cognizant.com
+cf-password: f12d75d4
+cf-org: brajan-pal
+aws-bucket: student-artifacts-grays
+aws-access-key-id: AKIAI3ZZPZHLEYLSDKVA
+aws-secret-access-key: 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
+github-repository: git@github.com:babuz/pal-tracker.git
+github-private-key: |
+    -----BEGIN RSA PRIVATE KEY-----
+    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
+    -----END RSA PRIVATE KEY-----
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..7a3265ee9
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..c418cb7c3
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Aug 14 15:24:49 CEST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.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..f9553162f
--- /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..8a4996f28
--- /dev/null
+++ b/manifest-production.yml
@@ -0,0 +1,5 @@
+---
+applications:
+- name: pal-tracker
+  path: build/libs/pal-tracker.jar
+  host: ganesh-pal-tracker
diff --git a/manifest-review.yml b/manifest-review.yml
new file mode 100644
index 000000000..f0a1e0498
--- /dev/null
+++ b/manifest-review.yml
@@ -0,0 +1,5 @@
+---
+applications:
+- name: pal-tracker
+  path: build/libs/pal-tracker.jar
+  host: ganesh-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..43ef13303
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/EnvController.java
@@ -0,0 +1,45 @@
+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;
+
+/**
+ * Created by Babu_2 on 15-08-2017.
+ */
+@RestController
+public class EnvController {
+    private final String port;
+    private final String memoryLimit;
+    private final String cfInstanceIndex;
+    private final String cfInstanceAddress;
+
+    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
+    ) {
+        this.port = port;
+        this.memoryLimit = memoryLimit;
+        this.cfInstanceIndex = cfInstanceIndex;
+        this.cfInstanceAddress = cfInstanceAddress;
+    }
+
+    @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", cfInstanceAddress);
+
+        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..07785c3e0
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java
@@ -0,0 +1,38 @@
+package io.pivotal.pal.tracker;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class InMemoryTimeEntryRepository implements TimeEntryRepository {
+    private HashMap<Long, TimeEntry> timeEntries = new HashMap<>();
+
+    @Override
+    public TimeEntry create(TimeEntry timeEntry) {
+        timeEntry.setId(timeEntries.size() + 1);
+        timeEntries.put(timeEntry.getId(), timeEntry);
+        return timeEntry;
+    }
+
+    @Override
+    public TimeEntry find(Long id) {
+        return timeEntries.get(id);
+    }
+
+    @Override
+    public List<TimeEntry> list() {
+        return new ArrayList<>(timeEntries.values());
+    }
+
+    @Override
+    public TimeEntry update(Long id, TimeEntry timeEntry) {
+        timeEntries.replace(id, timeEntry);
+        timeEntry.setId(id);
+        return timeEntry;
+    }
+
+    @Override
+    public void delete(Long id) {
+        timeEntries.remove(id);
+    }
+}
\ No newline at end of file
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..8a8c728a7
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java
@@ -0,0 +1,18 @@
+package io.pivotal.pal.tracker;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+
+@SpringBootApplication
+public class PalTrackerApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(PalTrackerApplication.class, args);
+    }
+
+    @Bean
+    TimeEntryRepository timeEntryRepository() {
+        return new InMemoryTimeEntryRepository();
+    }
+}
\ No newline at end of file
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..d8a678051
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/TimeEntry.java
@@ -0,0 +1,86 @@
+package io.pivotal.pal.tracker;
+
+public class TimeEntry {
+    private long id;
+    private long projectId;
+    private long userId;
+    private String date;
+    private int hours;
+
+    public TimeEntry() {
+    }
+
+    public TimeEntry(long projectId, long userId, String date, int hours) {
+        this.projectId = projectId;
+        this.userId = userId;
+        this.date = date;
+        this.hours = hours;
+    }
+
+    public TimeEntry(long id, long projectId, long userId, String date, int hours) {
+        this.id = id;
+        this.projectId = projectId;
+        this.userId = userId;
+        this.date = date;
+        this.hours = hours;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getProjectId() {
+        return projectId;
+    }
+
+    public long getUserId() {
+        return userId;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public int getHours() {
+        return hours;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        TimeEntry timeEntry = (TimeEntry) o;
+
+        if (id != timeEntry.id) return false;
+        if (projectId != timeEntry.projectId) return false;
+        if (userId != timeEntry.userId) return false;
+        if (hours != timeEntry.hours) return false;
+        return date != null ? date.equals(timeEntry.date) : timeEntry.date == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = (int) (id ^ (id >>> 32));
+        result = 31 * result + (int) (projectId ^ (projectId >>> 32));
+        result = 31 * result + (int) (userId ^ (userId >>> 32));
+        result = 31 * result + (date != null ? date.hashCode() : 0);
+        result = 31 * result + hours;
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "TimeEntry{" +
+                "id=" + id +
+                ", projectId=" + projectId +
+                ", userId=" + userId +
+                ", date='" + date + '\'' +
+                ", hours=" + hours +
+                '}';
+    }
+}
\ No newline at end of file
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..1f460951a
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java
@@ -0,0 +1,57 @@
+package io.pivotal.pal.tracker;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/time-entries")
+public class TimeEntryController {
+
+    private TimeEntryRepository timeEntriesRepo;
+
+    public TimeEntryController(TimeEntryRepository timeEntriesRepo) {
+        this.timeEntriesRepo = timeEntriesRepo;
+    }
+
+    @PostMapping
+    public ResponseEntity<TimeEntry> create(@RequestBody TimeEntry timeEntry) {
+        TimeEntry createdTimeEntry = timeEntriesRepo.create(timeEntry);
+
+        return new ResponseEntity<>(createdTimeEntry, HttpStatus.CREATED);
+    }
+
+    @GetMapping("{id}")
+    public ResponseEntity<TimeEntry> read(@PathVariable Long id) {
+        TimeEntry timeEntry = timeEntriesRepo.find(id);
+        if (timeEntry != null) {
+            return new ResponseEntity<>(timeEntry, HttpStatus.OK);
+        } else {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+    }
+
+    @GetMapping
+    public ResponseEntity<List<TimeEntry>> list() {
+        return new ResponseEntity<>(timeEntriesRepo.list(), HttpStatus.OK);
+    }
+
+    @PutMapping("{id}")
+    public ResponseEntity<TimeEntry> update(@PathVariable Long id, @RequestBody TimeEntry timeEntry) {
+        TimeEntry updatedTimeEntry = timeEntriesRepo.update(id, timeEntry);
+        if (updatedTimeEntry != null) {
+            return new ResponseEntity<>(updatedTimeEntry, HttpStatus.OK);
+        } else {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+    }
+
+    @DeleteMapping("{id}")
+    public ResponseEntity<TimeEntry> delete(@PathVariable Long id) {
+        timeEntriesRepo.delete(id);
+
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+}
\ No newline at end of file
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..866097db4
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java
@@ -0,0 +1,11 @@
+package io.pivotal.pal.tracker;
+
+import java.util.List;
+
+public interface TimeEntryRepository {
+    TimeEntry create(TimeEntry timeEntry);
+    TimeEntry find(Long id);
+    List<TimeEntry> list();
+    TimeEntry update(Long id, TimeEntry timeEntry);
+    void delete(Long id);
+}
\ No newline at end of file
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..7d04f89fb
--- /dev/null
+++ b/src/main/java/io/pivotal/pal/tracker/WelcomeController.java
@@ -0,0 +1,20 @@
+package io.pivotal.pal.tracker;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Value;
+
+@RestController
+public class WelcomeController {
+
+    private String message;
+
+    public WelcomeController(@Value("${welcome_message}") String message){
+        this.message = message;
+    }
+
+    @GetMapping("/")
+    public String sayHello() {
+        return message;
+    }
+}
\ 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/InMemoryTimeEntryRepositoryTest.java b/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java
new file mode 100644
index 000000000..5364e4dba
--- /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.assertj.core.api.Assertions;
+import org.junit.Test;
+
+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(123, 456, "today", 8));
+
+        TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 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(123, 456, "today", 8));
+
+        TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8);
+        TimeEntry readEntry = repo.find(1L);
+        assertThat(readEntry).isEqualTo(expected);
+    }
+
+    @Test
+    public void list() throws Exception {
+        InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository();
+        repo.create(new TimeEntry(123, 456, "today", 8));
+        repo.create(new TimeEntry(789, 654, "yesterday", 4));
+
+        List<TimeEntry> expected = asList(
+                new TimeEntry(1L, 123, 456, "today", 8),
+                new TimeEntry(2L, 789, 654, "yesterday", 4)
+        );
+        assertThat(repo.list()).isEqualTo(expected);
+    }
+
+    @Test
+    public void update() throws Exception {
+        InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository();
+        TimeEntry created = repo.create(new TimeEntry(123, 456, "today", 8));
+
+        TimeEntry updatedEntry = repo.update(
+                created.getId(),
+                new TimeEntry(321, 654, "tomorrow", 5));
+
+        TimeEntry expected = new TimeEntry(created.getId(), 321, 654, "tomorrow", 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(123, 456, "today", 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..a6f1100b5
--- /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.TimeEntryRepository;
+import io.pivotal.pal.tracker.TimeEntryController;
+import io.pivotal.pal.tracker.TimeEntry;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+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.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+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, "today", 8);
+        doReturn(expected)
+            .when(timeEntryRepository)
+            .create(any(TimeEntry.class));
+
+        ResponseEntity response = controller.create(new TimeEntry(123, 456, "today", 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, "today", 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, "today", 8),
+            new TimeEntry(2, 789, 321, "yesterday", 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, "yesterday", 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..36dd6c687
--- /dev/null
+++ b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java
@@ -0,0 +1,119 @@
+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.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, "today", 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("today");
+        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("today");
+        assertThat(readJson.read("$.hours", Long.class)).isEqualTo(8);
+    }
+
+    @Test
+    public void testUpdate() throws Exception {
+        Long id = createTimeEntry();
+        TimeEntry updatedTimeEntry = new TimeEntry(2, 3, "tomorrow", 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("tomorrow");
+        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() {
+        return restTemplate.postForObject("/time-entries", timeEntry, TimeEntry.class).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");
+    }
+}