diff --git a/manifest.yml b/manifest.yml
new file mode 100644
index 0000000..2378e77
--- /dev/null
+++ b/manifest.yml
@@ -0,0 +1,8 @@
+---
+applications:
+  - name: boks-run
+    memory: 320MB
+    instances: 1
+    path: target/run-0.0.1-SNAPSHOT.jar
+services:
+   - boks-run-cloudant
diff --git a/pom.xml b/pom.xml
index a794510..7e439f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,8 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
+		<ektorp.version>1.4.2</ektorp.version>
+		<commons.lang3.version>3.4</commons.lang3.version>
 	</properties>
 
 	<dependencies>
@@ -41,8 +43,14 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.4</version>
+			<version>${commons.lang3.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.ektorp</groupId>
+			<artifactId>org.ektorp.spring</artifactId>
+			<version>${ektorp.version}</version>
+		</dependency>
+				
 	</dependencies>
 	
 	<build>
@@ -51,22 +59,6 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
-			<plugin>
-			    <groupId>com.spotify</groupId>
-			    <artifactId>docker-maven-plugin</artifactId>
-			    <version>0.3.8</version>
-			    <configuration>
-			        <imageName>boksrun/${project.artifactId}</imageName>
-			        <dockerDirectory>src/main/docker</dockerDirectory>
-			        <resources>
-			            <resource>
-			                <targetPath>/</targetPath>
-			                <directory>${project.build.directory}</directory>
-			                <include>${project.build.finalName}.war</include>
-			            </resource>
-			        </resources>
-			    </configuration>
-			</plugin>
 		</plugins>
 		
 	</build>
diff --git a/src/main/docker/dockerfile b/src/main/docker/dockerfile
deleted file mode 100644
index 191abb6..0000000
--- a/src/main/docker/dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM ubuntu:14.04 
-MAINTAINER Jason McNeil <jason@jasonrm.net> 
-ENV DEBIAN_FRONTEND noninteractive 
-RUN apt-get update && apt-get upgrade -y && apt-get dist-upgrade -y
-# Common Deps 
-RUN apt-get -y install curl software-properties-common
-# Oracle Java 8 
-RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections
-RUN add-apt-repository ppa:webupd8team/java && apt-get update
-RUN apt-get -y install oracle-java8-installer
-RUN update-java-alternatives -s java-8-oracle
-ENV JAVA_HOME /usr/lib/jvm/java-8-oracle 
-ENV JAVA8_HOME /usr/lib/jvm/java-8-oracle 
-# MongoDB 
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
-ADD mongodb.list /etc/apt/sources.list.d/mongodb.list
-RUN apt-get update && apt-get -y install mongodb-server
-
-EXPOSE 8080 8081 8443 8843 8880
\ No newline at end of file
diff --git a/src/main/java/be/boks/RunApplication.java b/src/main/java/be/boks/RunApplication.java
index 49e4c79..1ee25dd 100644
--- a/src/main/java/be/boks/RunApplication.java
+++ b/src/main/java/be/boks/RunApplication.java
@@ -1,14 +1,45 @@
 package be.boks;
 
+import java.io.IOException;
+
+import org.ektorp.CouchDbConnector;
+import org.ektorp.CouchDbInstance;
+import org.ektorp.http.HttpClient;
+import org.ektorp.http.StdHttpClient;
+import org.ektorp.impl.StdCouchDbConnector;
+import org.ektorp.impl.StdCouchDbInstance;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
 public class RunApplication {
+	
+	private static final String DATABASE_NAME = "boks-run";
+	@Value("${vcap.services.boks-run-cloudant.credentials.host:}")
+	private String host;
+	@Value("${vcap.services.boks-run-cloudant.credentials.username:}")
+	private String username;
+	@Value("${vcap.services.boks-run-cloudant.credentials.password:}")
+	private String password;
 
     public static void main(String[] args) {
         SpringApplication.run(RunApplication.class, args);
     }
     
+	@Bean
+	public CouchDbConnector couchDb() throws IOException {
+		HttpClient httpClient = new StdHttpClient.Builder()
+				.url("https://" + host).port(443).username(username)
+				.password(password).build();
+
+		CouchDbInstance dbInstance = new StdCouchDbInstance(httpClient);
+
+		CouchDbConnector db = new StdCouchDbConnector(DATABASE_NAME, dbInstance);
+		db.createDatabaseIfNotExists();
+
+		return db;
+	}    
 }
  
\ No newline at end of file
diff --git a/src/main/java/be/boks/domain/Club.java b/src/main/java/be/boks/domain/Club.java
new file mode 100644
index 0000000..cc08323
--- /dev/null
+++ b/src/main/java/be/boks/domain/Club.java
@@ -0,0 +1,42 @@
+package be.boks.domain;
+
+import java.io.Serializable;
+
+import org.springframework.data.annotation.Id;
+
+public class Club implements Serializable {
+
+	private static final long serialVersionUID = -1535672487981334177L;
+
+	@Id
+	private Long id;
+	
+	private String name;
+	
+	private String type = "club";
+	
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+	
+}
diff --git a/src/main/java/be/boks/domain/Runner.java b/src/main/java/be/boks/domain/Runner.java
index ad78675..ee0ca85 100644
--- a/src/main/java/be/boks/domain/Runner.java
+++ b/src/main/java/be/boks/domain/Runner.java
@@ -1,5 +1,6 @@
 package be.boks.domain;
 
+import java.io.Serializable;
 import java.time.LocalDate;
 import java.util.List;
 
@@ -8,7 +9,10 @@
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.springframework.data.annotation.Id;
 
-public class Runner {
+public class Runner implements Serializable {
+	
+	private static final long serialVersionUID = 2530453437671327658L;
+
 	@Id
 	private Long id;
 	
@@ -26,7 +30,7 @@ public class Runner {
 	
 	private String city;
 	
-	private String runningClub;
+	private Club runningClub;
 	
 	private List<Category> categories;
 	
@@ -36,6 +40,8 @@ public class Runner {
 	
 	private List<Time> times;
 	
+	private String type = "runner";
+	
 	public Long getId() {
 		return id;
 	}
@@ -96,11 +102,11 @@ public void setCity(String city) {
 		this.city = city;
 	}
 	
-	public String getRunningClub() {
+	public Club getRunningClub() {
 		return runningClub;
 	}
 	
-	public void setRunningClub(String runningClub) {
+	public void setRunningClub(Club runningClub) {
 		this.runningClub = runningClub;
 	}
 	
@@ -136,6 +142,14 @@ public void setTimes(List<Time> times) {
 		this.times = times;
 	}
 
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
 	@Override
 	public int hashCode() {
 		HashCodeBuilder builder = new HashCodeBuilder();
diff --git a/src/main/java/be/boks/domain/Time.java b/src/main/java/be/boks/domain/Time.java
index 6a6f833..6994e63 100644
--- a/src/main/java/be/boks/domain/Time.java
+++ b/src/main/java/be/boks/domain/Time.java
@@ -14,6 +14,8 @@ public class Time {
 	
 	private Category category;
 	
+	private String type = "time";
+	
 	public Long getId() {
 		return id;
 	}
@@ -41,6 +43,13 @@ public Category getCategory() {
 	public void setCategory(Category category) {
 		this.category = category;
 	}
-	
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
 	
 }
diff --git a/src/main/java/be/boks/repository/ClubRepository.java b/src/main/java/be/boks/repository/ClubRepository.java
new file mode 100644
index 0000000..5a2a041
--- /dev/null
+++ b/src/main/java/be/boks/repository/ClubRepository.java
@@ -0,0 +1,12 @@
+package be.boks.repository;
+
+import java.util.List;
+
+import org.ektorp.support.GenericRepository;
+
+import be.boks.domain.Club;
+
+public interface ClubRepository extends GenericRepository<Club> {
+
+	List<Club> getClubs();
+}
diff --git a/src/main/java/be/boks/repository/ClubRepositoryImpl.java b/src/main/java/be/boks/repository/ClubRepositoryImpl.java
new file mode 100644
index 0000000..41ea50c
--- /dev/null
+++ b/src/main/java/be/boks/repository/ClubRepositoryImpl.java
@@ -0,0 +1,32 @@
+package be.boks.repository;
+
+import java.util.List;
+
+import org.ektorp.CouchDbConnector;
+import org.ektorp.support.CouchDbRepositorySupport;
+import org.ektorp.support.View;
+import org.ektorp.support.Views;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import be.boks.domain.Club;
+
+@Repository
+@Views({
+    @View(name = "all", map = "function(doc) { if (doc.type == 'club' ) emit( null, doc )}")
+})
+public class ClubRepositoryImpl extends CouchDbRepositorySupport<Club> implements ClubRepository {
+
+    @Autowired
+    public ClubRepositoryImpl(CouchDbConnector db) {
+        super(Club.class, db);
+        initStandardDesignDocument();
+    }
+
+	@Override
+	public List<Club> getClubs() {
+		return queryView("all");
+	}	
+    
+    
+}
diff --git a/src/main/java/be/boks/repository/RunnerRepository.java b/src/main/java/be/boks/repository/RunnerRepository.java
index 72810dd..51e6c00 100644
--- a/src/main/java/be/boks/repository/RunnerRepository.java
+++ b/src/main/java/be/boks/repository/RunnerRepository.java
@@ -2,15 +2,11 @@
 
 import java.util.List;
 
-import org.springframework.data.mongodb.repository.MongoRepository;
-import org.springframework.stereotype.Repository;
+import org.ektorp.support.GenericRepository;
 
 import be.boks.domain.Runner;
 
-@Repository
-public interface RunnerRepository extends MongoRepository<Runner, Long> {
-	
-	public List<Runner> findByFirstNameAndLastName(String firstName, String lastName);
-	
-	public List<Runner> findByLastName(String lastName);
+public interface RunnerRepository extends GenericRepository<Runner> {
+
+	List<Runner> getAll();
 }
diff --git a/src/main/java/be/boks/repository/RunnerRepositoryImpl.java b/src/main/java/be/boks/repository/RunnerRepositoryImpl.java
new file mode 100644
index 0000000..5e4d4dc
--- /dev/null
+++ b/src/main/java/be/boks/repository/RunnerRepositoryImpl.java
@@ -0,0 +1,31 @@
+package be.boks.repository;
+
+import java.util.List;
+
+import org.ektorp.CouchDbConnector;
+import org.ektorp.support.CouchDbRepositorySupport;
+import org.ektorp.support.View;
+import org.ektorp.support.Views;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import be.boks.domain.Runner;
+
+@Repository
+@Views({
+    @View(name = "all", map = "function(doc) { if (doc.type == 'runner' ) emit( null, doc )}")
+})
+public class RunnerRepositoryImpl extends CouchDbRepositorySupport<Runner> implements RunnerRepository {
+	
+
+    @Autowired
+    public RunnerRepositoryImpl(CouchDbConnector db) {
+        super(Runner.class, db);
+        initStandardDesignDocument();
+    }
+    
+    @Override
+    public List<Runner> getAll() {
+    	return queryView("all");
+    }
+}
diff --git a/src/main/java/be/boks/rest/ClubController.java b/src/main/java/be/boks/rest/ClubController.java
index b99792d..c8a942a 100644
--- a/src/main/java/be/boks/rest/ClubController.java
+++ b/src/main/java/be/boks/rest/ClubController.java
@@ -1,15 +1,29 @@
 package be.boks.rest;
 
+import java.util.List;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import be.boks.domain.Club;
+import be.boks.service.ClubService;
+
 @RestController
 @RequestMapping("/club")
 public class ClubController {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(ClubController.class);
 	
+	@Autowired
+	private ClubService clubService;
 	
+	@RequestMapping(method=RequestMethod.GET)
+	public List<Club> getClubs() {
+		LOGGER.info("Getting the clubs information.");
+		return clubService.getAll();
+	}
 }
diff --git a/src/main/java/be/boks/rest/RunnerController.java b/src/main/java/be/boks/rest/RunnerController.java
index 7eb601b..408a1f7 100644
--- a/src/main/java/be/boks/rest/RunnerController.java
+++ b/src/main/java/be/boks/rest/RunnerController.java
@@ -13,7 +13,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import be.boks.domain.Runner;
-import be.boks.repository.RunnerRepository;
+import be.boks.service.RunnerService;
 
 @RestController
 @RequestMapping("/loper")
@@ -22,18 +22,18 @@ public class RunnerController {
 	private static final Logger LOGGER = LoggerFactory.getLogger(RunnerController.class);
 	
 	@Autowired
-	private RunnerRepository runnerRepository;
-	
+	private RunnerService runnerService;
 	
+	@RequestMapping(method=RequestMethod.GET)
 	public List<Runner> getAll() {
 		LOGGER.info("Getting all the runners");
-		return runnerRepository.findAll();
+		return runnerService.getAll();
 	}
 	
 	@RequestMapping(method=RequestMethod.POST, path="/registreer")
 	public void register(@Valid @RequestBody Runner runner) {
 		LOGGER.info("Saving runner: " +runner);
-		//Runner saved = runnerRepository.insert(runner);
-		//LOGGER.info("Saved runner: " + saved);
+		Runner saved = runnerService.insert(runner);
+		LOGGER.info("Saved runner: " + saved);
 	}
 }
diff --git a/src/main/java/be/boks/service/ClubService.java b/src/main/java/be/boks/service/ClubService.java
new file mode 100644
index 0000000..dba4758
--- /dev/null
+++ b/src/main/java/be/boks/service/ClubService.java
@@ -0,0 +1,20 @@
+package be.boks.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import be.boks.domain.Club;
+import be.boks.repository.ClubRepository;
+
+@Service
+public class ClubService {
+
+	@Autowired
+	private ClubRepository clubRepository;
+	
+	public List<Club> getAll() {
+		return clubRepository.getAll();
+	}
+}
diff --git a/src/main/java/be/boks/service/RunnerService.java b/src/main/java/be/boks/service/RunnerService.java
new file mode 100644
index 0000000..df4309e
--- /dev/null
+++ b/src/main/java/be/boks/service/RunnerService.java
@@ -0,0 +1,25 @@
+package be.boks.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import be.boks.domain.Runner;
+import be.boks.repository.RunnerRepository;
+
+@Service
+public class RunnerService {
+
+	@Autowired
+	private RunnerRepository runnerRepository;
+	
+	public Runner insert(Runner runner) {
+		runnerRepository.add(runner);
+		return runner;
+	}
+	
+	public List<Runner> getAll() {
+		return runnerRepository.getAll();
+	}
+}
diff --git a/src/test/java/be/boks/controller/ClubControllerTest.java b/src/test/java/be/boks/controller/ClubControllerTest.java
new file mode 100644
index 0000000..5dc38a0
--- /dev/null
+++ b/src/test/java/be/boks/controller/ClubControllerTest.java
@@ -0,0 +1,41 @@
+package be.boks.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import be.boks.domain.Club;
+import be.boks.rest.ClubController;
+import be.boks.service.ClubService;
+
+public class ClubControllerTest {
+
+	private ClubController clubController;
+	
+	private ClubService clubService;
+	
+	@Before
+	public void setUp() {
+		clubService = Mockito.mock(ClubService.class);
+		clubController = new ClubController();
+		ReflectionTestUtils.setField(clubController, "clubService", clubService);
+	}
+	
+	@Test
+	public void testGetAll() {
+		List<Club> input = new ArrayList<>();
+		Club club = new Club();
+		club.setName("club");
+		input.add(club);
+		Mockito.when(clubService.getAll()).thenReturn(input);
+		List<Club> results = clubController.getClubs();
+		Mockito.verify(clubService).getAll();
+		Assert.assertEquals("The results should be correct", input, results);
+		Mockito.verifyNoMoreInteractions(clubService);
+	}
+}
diff --git a/src/test/java/be/boks/controller/RunnerControllerTest.java b/src/test/java/be/boks/controller/RunnerControllerTest.java
new file mode 100644
index 0000000..2af7308
--- /dev/null
+++ b/src/test/java/be/boks/controller/RunnerControllerTest.java
@@ -0,0 +1,51 @@
+package be.boks.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import be.boks.domain.Runner;
+import be.boks.rest.RunnerController;
+import be.boks.service.RunnerService;
+
+public class RunnerControllerTest {
+
+	private RunnerController runnerController;
+	
+	private RunnerService runnerService;
+	
+	@Before
+	public void setUp() {
+		runnerController = new RunnerController();
+		runnerService = Mockito.mock(RunnerService.class);
+		ReflectionTestUtils.setField(runnerController, "runnerService", runnerService);
+	}
+	
+	@Test
+	public void testGetAll() throws Exception {
+		List<Runner> input = new ArrayList<>();
+		Runner runner = new Runner();
+		runner.setFirstName("test");
+		input.add(runner);
+		Mockito.when(runnerService.getAll()).thenReturn(input);
+		List<Runner> results = runnerController.getAll();
+		Mockito.verify(runnerService).getAll();
+		Assert.assertEquals("The results should be correct", input, results);
+		Mockito.verifyNoMoreInteractions(runnerService);		
+	}
+	
+	@Test
+	public void testRegister() throws Exception {
+		Runner runner = new Runner();
+		runner.setFirstName("test");
+		Mockito.when(runnerService.insert(runner)).thenReturn(runner);
+		runnerController.register(runner);
+		Mockito.verify(runnerService).insert(runner);
+		Mockito.verifyNoMoreInteractions(runnerService);
+	}
+}
diff --git a/src/test/java/be/boks/service/ClubServiceTest.java b/src/test/java/be/boks/service/ClubServiceTest.java
new file mode 100644
index 0000000..11a08fb
--- /dev/null
+++ b/src/test/java/be/boks/service/ClubServiceTest.java
@@ -0,0 +1,41 @@
+package be.boks.service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import be.boks.domain.Club;
+import be.boks.repository.ClubRepository;
+import be.boks.service.ClubService;
+
+public class ClubServiceTest {
+
+	private ClubService clubService;
+	
+	private ClubRepository clubRepository;
+	
+	@Before
+	public void setUp() throws Exception {
+		clubService = new ClubService();
+		clubRepository = Mockito.mock(ClubRepository.class);
+		ReflectionTestUtils.setField(clubService, "clubRepository", clubRepository);
+	}
+	
+	@Test
+	public void testGetAll() throws Exception {
+		List<Club> input = new ArrayList<>();
+		Club club = new Club();
+		club.setName("club");
+		input.add(club);
+		Mockito.when(clubRepository.getAll()).thenReturn(input);
+		List<Club> results = clubService.getAll();
+		Mockito.verify(clubRepository).getAll();
+		Mockito.verifyNoMoreInteractions(clubRepository);
+		Assert.assertEquals("The result should be correct", input, results);
+	}
+}
diff --git a/src/test/java/be/boks/service/RunnerServiceTest.java b/src/test/java/be/boks/service/RunnerServiceTest.java
new file mode 100644
index 0000000..90393ea
--- /dev/null
+++ b/src/test/java/be/boks/service/RunnerServiceTest.java
@@ -0,0 +1,51 @@
+package be.boks.service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import be.boks.domain.Runner;
+import be.boks.repository.RunnerRepository;
+import be.boks.service.RunnerService;
+
+public class RunnerServiceTest {
+	
+	private RunnerRepository runnerRepository;
+	
+	private RunnerService runnerService;
+	
+	@Before
+	public void setUp() throws Exception {
+		runnerService = new RunnerService();
+		runnerRepository = Mockito.mock(RunnerRepository.class);
+		ReflectionTestUtils.setField(runnerService, "runnerRepository", runnerRepository);
+	}
+	
+	@Test
+	public void testGetAll() throws Exception {
+		List<Runner> input = new ArrayList<>();
+		Runner runner = new Runner();
+		runner.setFirstName("test");
+		input.add(runner);
+		Mockito.when(runnerRepository.getAll()).thenReturn(input);
+		List<Runner> results = runnerService.getAll();
+		Mockito.verify(runnerRepository).getAll();
+		Mockito.verifyNoMoreInteractions(runnerRepository);
+		Assert.assertEquals("The results are correct", input, results);
+	}
+	
+	@Test
+	public void testInsert() throws Exception {
+		Runner runner = new Runner();
+		runner.setFirstName("test");
+		runnerService.insert(runner);
+		Mockito.verify(runnerRepository).add(runner);
+		Mockito.verifyNoMoreInteractions(runnerRepository);
+	}
+}
+