diff --git a/config-cli/pom.xml b/config-cli/pom.xml
index e58df25dae..176edec2d4 100644
--- a/config-cli/pom.xml
+++ b/config-cli/pom.xml
@@ -24,6 +24,11 @@
             <artifactId>config</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.quorum.tessera</groupId>
+            <artifactId>jaxrs-client</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
@@ -44,11 +49,29 @@
             <artifactId>test-util</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+        </dependency>
+      
         <dependency>
             <groupId>com.quorum.tessera</groupId>
             <artifactId>key-generation</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.quorum.tessera</groupId>
+            <artifactId>jersey-server</artifactId>
+            <scope>test</scope>
+        </dependency>
+      
+        <dependency>
+            <groupId>org.glassfish.jersey.test-framework</groupId>
+            <artifactId>jersey-test-framework-core</artifactId>
+            <version>2.27</version>
+            <scope>test</scope>
+            <type>jar</type>
+        </dependency>
     </dependencies>
 
     
diff --git a/config-cli/src/main/java/com/quorum/tessera/config/cli/AdminCliAdapter.java b/config-cli/src/main/java/com/quorum/tessera/config/cli/AdminCliAdapter.java
new file mode 100644
index 0000000000..aab51d26cd
--- /dev/null
+++ b/config-cli/src/main/java/com/quorum/tessera/config/cli/AdminCliAdapter.java
@@ -0,0 +1,124 @@
+package com.quorum.tessera.config.cli;
+
+import com.quorum.tessera.config.Config;
+import com.quorum.tessera.config.Peer;
+import com.quorum.tessera.config.ServerConfig;
+import com.quorum.tessera.config.cli.parsers.ConfigurationParser;
+import com.quorum.tessera.jaxrs.client.ClientFactory;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+
+/**
+ * Cli Adapter to be used for runtime updates
+ */
+public class AdminCliAdapter implements CliAdapter {
+    
+    private final ClientFactory clientFactory;
+
+    public AdminCliAdapter(ClientFactory clientFactory) {
+        this.clientFactory = Objects.requireNonNull(clientFactory);
+    }
+    
+    /**
+     *
+     * @param args
+     * @return CliResult with config object always null.
+     * @throws Exception
+     */
+    @Override
+    public CliResult execute(String... args) throws Exception {
+
+        final Options options = new Options();
+
+        options.addOption(
+                Option.builder("configfile")
+                        .desc("Path to node configuration file")
+                        .hasArg(true)
+                        .required()
+                        .optionalArg(false)
+                        .numberOfArgs(1)
+                        .argName("PATH")
+                        .build());
+
+        options.addOption(Option.builder("addpeer")
+                .desc("Add peer to running node")
+                .hasArg(true)
+                .optionalArg(false)
+                .numberOfArgs(1)
+                .argName("URL")
+                .build());
+
+        final List<String> argsList = Arrays.asList(args);
+
+        if (argsList.contains("help") || argsList.isEmpty()) {
+            HelpFormatter formatter = new HelpFormatter();
+            formatter.setWidth(200);
+            formatter.printHelp("tessera admin", options);
+            return new CliResult(0, true, null);
+        }
+
+        final CommandLine line = new DefaultParser().parse(options, args);
+        if(!line.hasOption("addpeer")) {
+            System.out.println("No peer defined");
+            return new CliResult(1, true, null);
+        }
+
+        Config config = new ConfigurationParser().parse(line);
+
+        Client restClient = clientFactory.buildFrom(config.getServerConfig());
+
+        String peerUrl = line.getOptionValue("addpeer");
+    
+        final Peer peer = new Peer(peerUrl);
+        
+        String scheme = Optional.of(config)
+                .map(Config::getServerConfig)
+                .map(ServerConfig::getServerUri)
+                .map(URI::getScheme)
+                .orElse("http");
+        
+        Integer port = Optional.of(config)
+                .map(Config::getServerConfig)
+                .map(ServerConfig::getPort)
+                .orElse(80);
+ 
+        URI uri = UriBuilder.fromPath("/")
+                .port(port)
+                .host("localhost")
+                .scheme(scheme).build();
+        
+        
+        Response response = restClient.target(uri)
+                .path("config")
+                .path("peers")
+                .request(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .put(Entity.entity(peer, MediaType.APPLICATION_JSON)); 
+
+        if(response.getStatus() == Response.Status.CREATED.getStatusCode()) {
+
+            System.out.printf("Peer %s added.",response.getLocation());
+            System.out.println();
+            
+            return new CliResult(0, true, null);
+        }
+        
+        System.err.println("Unable to create peer");
+        
+        return new CliResult(1, true, null);
+    }
+
+}
diff --git a/config-cli/src/main/java/com/quorum/tessera/config/cli/CliAdapter.java b/config-cli/src/main/java/com/quorum/tessera/config/cli/CliAdapter.java
index 6af3b68d3b..6b2a908c13 100644
--- a/config-cli/src/main/java/com/quorum/tessera/config/cli/CliAdapter.java
+++ b/config-cli/src/main/java/com/quorum/tessera/config/cli/CliAdapter.java
@@ -4,8 +4,4 @@ public interface CliAdapter {
 
     CliResult execute(String... args) throws Exception;
 
-    static CliAdapter create() {
-        return new DefaultCliAdapter();
-    }
-
 }
diff --git a/config-cli/src/main/java/com/quorum/tessera/config/cli/CliDelegate.java b/config-cli/src/main/java/com/quorum/tessera/config/cli/CliDelegate.java
index 768a52f72c..07cfd70f77 100644
--- a/config-cli/src/main/java/com/quorum/tessera/config/cli/CliDelegate.java
+++ b/config-cli/src/main/java/com/quorum/tessera/config/cli/CliDelegate.java
@@ -1,6 +1,9 @@
 package com.quorum.tessera.config.cli;
 
 import com.quorum.tessera.config.Config;
+import com.quorum.tessera.jaxrs.client.ClientFactory;
+import java.util.Arrays;
+import java.util.List;
 
 public enum CliDelegate {
 
@@ -18,7 +21,15 @@ public Config getConfig() {
 
     public CliResult execute(String... args) throws Exception {
 
-        final CliAdapter cliAdapter = CliAdapter.create();
+        final List<String> argsList = Arrays.asList(args);
+            
+        final CliAdapter cliAdapter;
+        
+        if(argsList.contains("admin")) {
+            cliAdapter = new AdminCliAdapter(new ClientFactory());
+        } else {
+            cliAdapter = new DefaultCliAdapter();
+        }
 
         final CliResult result = cliAdapter.execute(args);
 
diff --git a/config-cli/src/main/java/com/quorum/tessera/config/cli/CliResult.java b/config-cli/src/main/java/com/quorum/tessera/config/cli/CliResult.java
index 4100d480cb..4bb7563c38 100644
--- a/config-cli/src/main/java/com/quorum/tessera/config/cli/CliResult.java
+++ b/config-cli/src/main/java/com/quorum/tessera/config/cli/CliResult.java
@@ -8,14 +8,14 @@
 public class CliResult {
     
     private final Integer status;
-    private final boolean isHelpOn;
-    private final boolean isKeyGenOn;
+    
+    private final boolean suppressStartup;
+    
     private final Config config;
 
-    public CliResult(Integer status, boolean isHelpOn, boolean isKeyGenOn, Config config) {
+    public CliResult(Integer status, boolean suppressStartup,Config config) {
         this.status = Objects.requireNonNull(status);
-        this.isHelpOn = isHelpOn;
-        this.isKeyGenOn = isKeyGenOn;
+        this.suppressStartup = suppressStartup;
         this.config = config;
     }
 
@@ -23,11 +23,10 @@ public Integer getStatus() {
         return status;
     }
 
-    public boolean isHelpOn() {
-        return isHelpOn;
+    public boolean isSuppressStartup() {
+        return suppressStartup;
     }
 
-    public boolean isKeyGenOn() {return isKeyGenOn;}
 
     public Optional<Config> getConfig() {
         return Optional.ofNullable(config);
diff --git a/config-cli/src/main/java/com/quorum/tessera/config/cli/DefaultCliAdapter.java b/config-cli/src/main/java/com/quorum/tessera/config/cli/DefaultCliAdapter.java
index 3524669347..3595be46a1 100644
--- a/config-cli/src/main/java/com/quorum/tessera/config/cli/DefaultCliAdapter.java
+++ b/config-cli/src/main/java/com/quorum/tessera/config/cli/DefaultCliAdapter.java
@@ -59,7 +59,7 @@ public CliResult execute(String... args) throws Exception {
             HelpFormatter formatter = new HelpFormatter();
             formatter.setWidth(200);
             formatter.printHelp("tessera -configfile <PATH> [-keygen <PATH>] [-pidfile <PATH>]", options);
-            return new CliResult(0, true, false, null);
+            return new CliResult(0, true, null);
         }
 
         try {
@@ -87,7 +87,7 @@ public CliResult execute(String... args) throws Exception {
 
             new PidFileParser().parse(line);
 
-            return new CliResult(0, false, line.hasOption("keygen"), config);
+            return new CliResult(0, line.hasOption("keygen"), config);
 
         } catch (ParseException exp) {
             throw new CliException(exp.getMessage());
diff --git a/config-cli/src/main/java/com/quorum/tessera/config/cli/parsers/ConfigurationParser.java b/config-cli/src/main/java/com/quorum/tessera/config/cli/parsers/ConfigurationParser.java
index 043643308c..f873b35d15 100644
--- a/config-cli/src/main/java/com/quorum/tessera/config/cli/parsers/ConfigurationParser.java
+++ b/config-cli/src/main/java/com/quorum/tessera/config/cli/parsers/ConfigurationParser.java
@@ -2,6 +2,7 @@
 
 import com.quorum.tessera.config.Config;
 import com.quorum.tessera.config.ConfigFactory;
+import com.quorum.tessera.config.util.ConfigFileStore;
 import com.quorum.tessera.config.keypairs.ConfigKeyPair;
 import com.quorum.tessera.config.util.JaxbUtil;
 import org.apache.commons.cli.CommandLine;
@@ -50,6 +51,8 @@ public Config parse(final CommandLine commandLine) throws IOException {
                 //we have generated new keys, so we need to output the new configuration
                 output(commandLine, config);
             }
+            
+            ConfigFileStore.create(path);
 
         }
 
diff --git a/config-cli/src/test/java/com/quorum/tessera/config/cli/AdminCliAdapterTest.java b/config-cli/src/test/java/com/quorum/tessera/config/cli/AdminCliAdapterTest.java
new file mode 100644
index 0000000000..47a8ff5875
--- /dev/null
+++ b/config-cli/src/test/java/com/quorum/tessera/config/cli/AdminCliAdapterTest.java
@@ -0,0 +1,116 @@
+package com.quorum.tessera.config.cli;
+
+import com.quorum.tessera.config.Peer;
+import com.quorum.tessera.config.ServerConfig;
+import com.quorum.tessera.jaxrs.client.ClientFactory;
+import com.quorum.tessera.test.util.ElUtil;
+import java.net.URI;
+import java.nio.file.Path;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Before;
+import org.junit.Test;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+public class AdminCliAdapterTest {
+
+    private AdminCliAdapter adminCliAdapter;
+    
+    private ClientFactory clientFactory;
+    
+    private Invocation.Builder invocationBuilder;
+
+    @Before
+    public void onSetUp() {
+        
+        invocationBuilder = mock(Invocation.Builder.class);
+        
+        clientFactory = mock(ClientFactory.class);
+        
+        Client client = mock(Client.class);
+        WebTarget webTarget = mock(WebTarget.class);
+        
+        when(client.target(any(URI.class))).thenReturn(webTarget);
+        when(webTarget.path(anyString())).thenReturn(webTarget,webTarget);
+
+        when(webTarget.request(MediaType.APPLICATION_JSON)).thenReturn(invocationBuilder);
+        
+        when(invocationBuilder.accept(MediaType.APPLICATION_JSON)).thenReturn(invocationBuilder);
+
+        when(clientFactory.buildFrom(any(ServerConfig.class))).thenReturn(client);
+
+        adminCliAdapter = new AdminCliAdapter(clientFactory);
+    }
+
+    public void onTearDown() {
+        verifyNoMoreInteractions(invocationBuilder);
+    }
+        
+    
+    @Test
+    public void help() throws Exception {
+        //new CliResult(0, true, false, null);
+        CliResult result = adminCliAdapter.execute("help");
+        assertThat(result).isNotNull();
+        assertThat(result.getConfig()).isNotPresent();
+        assertThat(result.isSuppressStartup()).isTrue();
+  
+    }
+    
+    @Test
+    public void addPeer() throws Exception {
+        
+        Peer peer = new Peer("http://junit.com:8989");
+        Entity entity = Entity.entity(peer, MediaType.APPLICATION_JSON);
+        
+        URI uri = UriBuilder.fromPath("/result").build();
+        when(invocationBuilder.put(entity)).thenReturn(Response.created(uri).build());
+
+        Path configFile = ElUtil.createAndPopulatePaths(getClass().getResource("/sample-config.json"));
+
+        CliResult result = adminCliAdapter.execute("-addpeer",peer.getUrl(),"-configfile",configFile.toString());
+        assertThat(result).isNotNull();
+        assertThat(result.getConfig()).isNotPresent();
+        assertThat(result.isSuppressStartup()).isTrue();
+        
+        assertThat(result.getStatus()).isEqualTo(0);
+        
+        verify(invocationBuilder).put(entity);
+        
+        
+    }
+    
+    @Test
+    public void addPeerSomethingBadWentDown() throws Exception {
+        
+        Peer peer = new Peer("http://junit.com:8989");
+        Entity entity = Entity.entity(peer, MediaType.APPLICATION_JSON);
+        
+        URI uri = UriBuilder.fromPath("/result").build();
+        when(invocationBuilder.put(entity)).thenReturn(Response.serverError().build());
+
+        Path configFile = ElUtil.createAndPopulatePaths(getClass().getResource("/sample-config.json"));
+
+        CliResult result = adminCliAdapter.execute("-addpeer",peer.getUrl(),"-configfile",configFile.toString());
+        assertThat(result).isNotNull();
+        assertThat(result.getConfig()).isNotPresent();
+        assertThat(result.isSuppressStartup()).isTrue();
+        
+        assertThat(result.getStatus()).isEqualTo(1);
+        
+        verify(invocationBuilder).put(entity);
+        
+        
+    }
+}
diff --git a/config-cli/src/test/java/com/quorum/tessera/config/cli/CliAdapterTest.java b/config-cli/src/test/java/com/quorum/tessera/config/cli/CliAdapterTest.java
deleted file mode 100644
index bf96ed95c3..0000000000
--- a/config-cli/src/test/java/com/quorum/tessera/config/cli/CliAdapterTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.quorum.tessera.config.cli;
-
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class CliAdapterTest {
-
-    @Test
-    public void createDefault() {
-
-        CliAdapter result = CliAdapter.create();
-
-        assertThat(result).isExactlyInstanceOf(DefaultCliAdapter.class);
-
-    }
-}
diff --git a/config-cli/src/test/java/com/quorum/tessera/config/cli/CliDelegateTest.java b/config-cli/src/test/java/com/quorum/tessera/config/cli/CliDelegateTest.java
index dd248b47be..64711d6f18 100644
--- a/config-cli/src/test/java/com/quorum/tessera/config/cli/CliDelegateTest.java
+++ b/config-cli/src/test/java/com/quorum/tessera/config/cli/CliDelegateTest.java
@@ -18,6 +18,15 @@ public void createInstance() {
 
     }
 
+    @Test
+    public void createAdminInstance() throws Exception {
+
+        Path configFile = ElUtil.createAndPopulatePaths(getClass().getResource("/sample-config.json"));
+        CliResult result = instance.execute("admin", "-configfile",  configFile.toString());
+
+        assertThat(result).isNotNull();
+    }
+
     @Test
     public void withValidConfig() throws Exception {
 
@@ -31,8 +40,8 @@ public void withValidConfig() throws Exception {
         assertThat(result.getConfig()).isPresent();
         assertThat(result.getConfig().get()).isSameAs(instance.getConfig());
         assertThat(result.getStatus()).isEqualTo(0);
-        assertThat(result.isHelpOn()).isFalse();
-        assertThat(result.isKeyGenOn()).isFalse();
+        assertThat(result.isSuppressStartup()).isFalse();
+ 
     }
 
     @Test
diff --git a/config-cli/src/test/java/com/quorum/tessera/config/cli/DefaultCliAdapterTest.java b/config-cli/src/test/java/com/quorum/tessera/config/cli/DefaultCliAdapterTest.java
index 7db7b34a98..c77ead533a 100644
--- a/config-cli/src/test/java/com/quorum/tessera/config/cli/DefaultCliAdapterTest.java
+++ b/config-cli/src/test/java/com/quorum/tessera/config/cli/DefaultCliAdapterTest.java
@@ -36,7 +36,7 @@ public class DefaultCliAdapterTest {
     @Before
     public void setUp() {
         MockKeyGeneratorFactory.reset();
-        this.cliDelegate = CliAdapter.create();
+        this.cliDelegate = new DefaultCliAdapter();
     }
     
     @After
@@ -53,8 +53,8 @@ public void help() throws Exception {
         assertThat(result).isNotNull();
         assertThat(result.getConfig()).isNotPresent();
         assertThat(result.getStatus()).isEqualTo(0);
-        assertThat(result.isHelpOn()).isTrue();
-        assertThat(result.isKeyGenOn()).isFalse();
+        assertThat(result.isSuppressStartup()).isTrue();
+
         
     }
     
@@ -66,8 +66,8 @@ public void noArgsPrintsHelp() throws Exception {
         assertThat(result).isNotNull();
         assertThat(result.getConfig()).isNotPresent();
         assertThat(result.getStatus()).isEqualTo(0);
-        assertThat(result.isHelpOn()).isTrue();
-        assertThat(result.isKeyGenOn()).isFalse();
+        assertThat(result.isSuppressStartup()).isTrue();
+
         
     }
     
@@ -80,7 +80,7 @@ public void withValidConfig() throws Exception {
         assertThat(result).isNotNull();
         assertThat(result.getConfig()).isPresent();
         assertThat(result.getStatus()).isEqualTo(0);
-        assertThat(result.isHelpOn()).isFalse();
+        assertThat(result.isSuppressStartup()).isFalse();
     }
     
     @Test(expected = FileNotFoundException.class)
@@ -133,7 +133,7 @@ public void keygen() throws Exception {
         assertThat(result).isNotNull();
         assertThat(result.getStatus()).isEqualTo(0);
         assertThat(result.getConfig()).isNotNull();
-        assertThat(result.isHelpOn()).isFalse();
+        assertThat(result.isSuppressStartup()).isTrue();
         
         verify(keyGenerator).generate(anyString(), eq(null));
         verifyNoMoreInteractions(keyGenerator);
@@ -146,7 +146,7 @@ public void keygenThenExit() throws Exception {
         final CliResult result = cliDelegate.execute("-keygen");
         
         assertThat(result).isNotNull();
-        assertThat(result.isKeyGenOn()).isTrue();
+        assertThat(result.isSuppressStartup()).isTrue();
         
     }
 
diff --git a/config-migration/src/main/java/com/quorum/tessera/config/migration/LegacyCliAdapter.java b/config-migration/src/main/java/com/quorum/tessera/config/migration/LegacyCliAdapter.java
index 514b4385a1..e2356de125 100644
--- a/config-migration/src/main/java/com/quorum/tessera/config/migration/LegacyCliAdapter.java
+++ b/config-migration/src/main/java/com/quorum/tessera/config/migration/LegacyCliAdapter.java
@@ -45,7 +45,7 @@ public CliResult execute(String... args) throws Exception {
             HelpFormatter formatter = new HelpFormatter();
             formatter.printHelp("tessera-config-migration", header, options, null);
             final int exitCode = argsList.isEmpty() ? 1 : 0;
-            return new CliResult(exitCode, true, false, null);
+            return new CliResult(exitCode, true, null);
         }
 
         CommandLineParser parser = new DefaultParser();
@@ -86,7 +86,7 @@ static CliResult writeToOutputFile(Config config, Path outputPath) throws IOExce
             JaxbUtil.marshal(config, outputStream);
             System.out.printf("Saved config to  %s", outputPath);
             System.out.println();
-            return new CliResult(0, false, false, config);
+            return new CliResult(0, false, config);
         } catch (ConstraintViolationException validationException) {
             validationException.getConstraintViolations()
                 .stream()
@@ -96,7 +96,7 @@ static CliResult writeToOutputFile(Config config, Path outputPath) throws IOExce
             Files.write(outputPath, JaxbUtil.marshalToStringNoValidation(config).getBytes());
             System.out.printf("Saved config to  %s", outputPath);
             System.out.println();
-            return new CliResult(2, false, false, config);
+            return new CliResult(2, false, config);
         }
     }
 
diff --git a/config/src/main/java/com/quorum/tessera/config/Config.java b/config/src/main/java/com/quorum/tessera/config/Config.java
index 57df24cce5..8bd68d448b 100644
--- a/config/src/main/java/com/quorum/tessera/config/Config.java
+++ b/config/src/main/java/com/quorum/tessera/config/Config.java
@@ -12,6 +12,7 @@
 import javax.xml.bind.annotation.*;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.nio.file.Path;
+import java.util.Collections;
 import java.util.List;
 
 @XmlRootElement
@@ -98,7 +99,7 @@ public Path getUnixSocketFile() {
     }
 
     public List<Peer> getPeers() {
-        return this.peers;
+        return Collections.unmodifiableList(peers);
     }
 
     public KeyConfiguration getKeys() {
@@ -116,5 +117,10 @@ public boolean isUseWhiteList() {
     public boolean isDisablePeerDiscovery() {
         return disablePeerDiscovery;
     }
+    
+    @XmlTransient
+    public void addPeer(Peer peer) {
+        this.peers.add(peer);
+    }
 
 }
diff --git a/config/src/main/java/com/quorum/tessera/config/util/ConfigFileStore.java b/config/src/main/java/com/quorum/tessera/config/util/ConfigFileStore.java
new file mode 100644
index 0000000000..711cb06340
--- /dev/null
+++ b/config/src/main/java/com/quorum/tessera/config/util/ConfigFileStore.java
@@ -0,0 +1,47 @@
+package com.quorum.tessera.config.util;
+
+import com.quorum.tessera.config.Config;
+import com.quorum.tessera.io.IOCallback;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.UUID;
+
+public interface ConfigFileStore {
+
+    enum Store implements ConfigFileStore {
+
+        INSTANCE;
+
+        private Path path;
+
+        @Override
+        public void save(Config config) {
+            
+            IOCallback.execute(() -> {
+                Path temp = Files.createTempFile(UUID.randomUUID().toString(), ".tmp");
+                try(OutputStream fout = Files.newOutputStream(temp)){
+                    JaxbUtil.marshalWithNoValidation(config, fout);
+                }
+                Files.copy(temp, path,StandardCopyOption.REPLACE_EXISTING);
+                return null;
+            });  
+        }
+    }
+
+    static ConfigFileStore create(Path path) {
+        Store.INSTANCE.path = path;
+        return Store.INSTANCE;
+    }
+    
+    
+    static ConfigFileStore get() {
+        return Store.INSTANCE;
+    }
+    
+    void save(Config config);
+    
+
+
+}
diff --git a/config/src/main/java/com/quorum/tessera/config/util/ConsolePasswordReader.java b/config/src/main/java/com/quorum/tessera/config/util/ConsolePasswordReader.java
index 77f10cb4ae..f37758abc4 100644
--- a/config/src/main/java/com/quorum/tessera/config/util/ConsolePasswordReader.java
+++ b/config/src/main/java/com/quorum/tessera/config/util/ConsolePasswordReader.java
@@ -10,6 +10,7 @@ public ConsolePasswordReader(final Console console) {
         this.console = console;
     }
 
+    @Override
     public String readPasswordFromConsole() {
         final char[] consolePassword = this.console.readPassword();
         return new String(consolePassword);
diff --git a/config/src/test/java/com/quorum/tessera/config/ConfigTest.java b/config/src/test/java/com/quorum/tessera/config/ConfigTest.java
new file mode 100644
index 0000000000..de3cae6f25
--- /dev/null
+++ b/config/src/test/java/com/quorum/tessera/config/ConfigTest.java
@@ -0,0 +1,25 @@
+package com.quorum.tessera.config;
+
+import java.util.ArrayList;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class ConfigTest {
+
+    @Test
+    public void createWithNullArgs() {
+        Config config = new Config(null, null, null, null, null, null, false, false);
+        assertThat(config).isNotNull();
+    }
+
+    @Test
+    public void addPeer() {
+        Config config = new Config(null, null, new ArrayList<>(), null, null, null, false, false);
+        assertThat(config.getPeers()).isEmpty();
+        Peer peer = new Peer("Junit");
+        config.addPeer(peer);
+        assertThat(config.getPeers()).containsOnly(peer);
+
+    }
+
+}
diff --git a/config/src/test/java/com/quorum/tessera/config/OpenPojoTest.java b/config/src/test/java/com/quorum/tessera/config/OpenPojoTest.java
index 81413c76e4..266bb3b3b9 100644
--- a/config/src/test/java/com/quorum/tessera/config/OpenPojoTest.java
+++ b/config/src/test/java/com/quorum/tessera/config/OpenPojoTest.java
@@ -24,6 +24,7 @@ public void executeOpenPojoValidations() {
             pc -> !pc.getClazz().isAssignableFrom(ObjectFactory.class),
             pc -> !pc.getClazz().isAssignableFrom(JaxbConfigFactory.class),
             pc -> !pc.getClazz().isAssignableFrom(ConfigException.class),
+            pc -> !pc.getClazz().isAssignableFrom(Config.class),
             pc -> !pc.getClazz().getName().contains(ConfigItem.class.getName()),
             pc -> !pc.getClazz().getSimpleName().contains("Test")
         };
diff --git a/config/src/test/java/com/quorum/tessera/config/util/ConfigFileStoreTest.java b/config/src/test/java/com/quorum/tessera/config/util/ConfigFileStoreTest.java
new file mode 100644
index 0000000000..0958862455
--- /dev/null
+++ b/config/src/test/java/com/quorum/tessera/config/util/ConfigFileStoreTest.java
@@ -0,0 +1,64 @@
+package com.quorum.tessera.config.util;
+
+import com.quorum.tessera.config.Config;
+import com.quorum.tessera.io.FilesDelegate;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.UUID;
+import javax.json.Json;
+import javax.json.JsonObject;
+import javax.json.JsonReader;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ConfigFileStoreTest {
+
+    private ConfigFileStore configFileStore;
+
+    private Path path;
+
+    @Before
+    public void onSetUp() throws Exception {
+        path = Files.createTempFile(UUID.randomUUID().toString(), ".junit");
+        path.toFile().deleteOnExit();
+
+        final URL sampleConfig = getClass().getResource("/sample.json");
+        try (InputStream in = sampleConfig.openStream()) {
+            Config initialConfig = JaxbUtil.unmarshal(in, Config.class);
+            JaxbUtil.marshal(initialConfig, Files.newOutputStream(path));
+        }
+
+        configFileStore = ConfigFileStore.create(path);
+    }
+
+    @Test
+    public void getReturnsSameInstance() {
+        assertThat(ConfigFileStore.get()).isSameAs(configFileStore);
+
+    }
+
+    @Test
+    public void save() throws Exception {
+
+        final URL updatedConfig = getClass().getResource("/sample_full.json");
+        try (InputStream in = updatedConfig.openStream()) {
+            Config config = JaxbUtil.unmarshal(in, Config.class);
+            configFileStore.save(config);
+        }
+
+        final JsonObject result = Optional.of(path)
+                .map(FilesDelegate.create()::newInputStream)
+                .map(Json::createReader)
+                .map(JsonReader::readObject)
+                .get();
+
+        assertThat(result.getJsonObject("server").getString("hostName"))
+                .isEqualTo("http://localhost");
+
+    }
+
+}
diff --git a/config/src/test/resources/sample.json b/config/src/test/resources/sample.json
index ffb517ae43..731152846a 100644
--- a/config/src/test/resources/sample.json
+++ b/config/src/test/resources/sample.json
@@ -45,7 +45,7 @@
                     },
                     "type": "argon2sbox"
                 },
-                "publicKey": "PUBLIC_KEY"
+                "publicKey": "UFVCTElDX0tFWQ=="
             }
         ]
     },
diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml
new file mode 100644
index 0000000000..2dd9c9a623
--- /dev/null
+++ b/jaxrs-client/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.quorum.tessera</groupId>
+        <artifactId>tessera</artifactId>
+        <version>0.7-SNAPSHOT</version>
+    </parent>
+    <artifactId>jaxrs-client</artifactId>
+    <packaging>jar</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>com.quorum.tessera</groupId>
+            <artifactId>config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.quorum.tessera</groupId>
+            <artifactId>security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.quorum.tessera</groupId>
+            <artifactId>jersey-server</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/jaxrs-service/src/main/java/com/quorum/tessera/client/ClientFactory.java b/jaxrs-client/src/main/java/com/quorum/tessera/jaxrs/client/ClientFactory.java
similarity index 96%
rename from jaxrs-service/src/main/java/com/quorum/tessera/client/ClientFactory.java
rename to jaxrs-client/src/main/java/com/quorum/tessera/jaxrs/client/ClientFactory.java
index 3d6f22d45f..0e57238ac5 100644
--- a/jaxrs-service/src/main/java/com/quorum/tessera/client/ClientFactory.java
+++ b/jaxrs-client/src/main/java/com/quorum/tessera/jaxrs/client/ClientFactory.java
@@ -1,4 +1,4 @@
-package com.quorum.tessera.client;
+package com.quorum.tessera.jaxrs.client;
 
 import com.quorum.tessera.config.ServerConfig;
 import com.quorum.tessera.ssl.context.SSLContextFactory;
diff --git a/jaxrs-service/src/test/java/com/quorum/tessera/node/ClientFactoryTest.java b/jaxrs-client/src/test/java/com/quorum/tessera/jaxrs/client/ClientFactoryTest.java
similarity index 96%
rename from jaxrs-service/src/test/java/com/quorum/tessera/node/ClientFactoryTest.java
rename to jaxrs-client/src/test/java/com/quorum/tessera/jaxrs/client/ClientFactoryTest.java
index 13f09f8a8b..e853834e4a 100644
--- a/jaxrs-service/src/test/java/com/quorum/tessera/node/ClientFactoryTest.java
+++ b/jaxrs-client/src/test/java/com/quorum/tessera/jaxrs/client/ClientFactoryTest.java
@@ -1,6 +1,6 @@
-package com.quorum.tessera.node;
+package com.quorum.tessera.jaxrs.client;
+
 
-import com.quorum.tessera.client.ClientFactory;
 import com.quorum.tessera.config.ServerConfig;
 import com.quorum.tessera.config.SslConfig;
 import com.quorum.tessera.ssl.context.SSLContextFactory;
diff --git a/jaxrs-service/pom.xml b/jaxrs-service/pom.xml
index f8fed45324..ac0125066c 100644
--- a/jaxrs-service/pom.xml
+++ b/jaxrs-service/pom.xml
@@ -30,6 +30,11 @@
             <groupId>com.quorum.tessera</groupId>
             <artifactId>config</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.quorum.tessera</groupId>
+            <artifactId>jaxrs-client</artifactId>
+        </dependency>
+        
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
@@ -82,7 +87,7 @@
                 </executions>
             </plugin>
             
-                        <plugin>
+            <plugin>
                 <groupId>com.github.kongchen</groupId>
                 <artifactId>swagger-maven-plugin</artifactId>
                 <version>3.1.7</version>
diff --git a/jaxrs-service/src/main/java/com/quorum/tessera/api/ConfigResource.java b/jaxrs-service/src/main/java/com/quorum/tessera/api/ConfigResource.java
new file mode 100644
index 0000000000..86692f3202
--- /dev/null
+++ b/jaxrs-service/src/main/java/com/quorum/tessera/api/ConfigResource.java
@@ -0,0 +1,59 @@
+package com.quorum.tessera.api;
+
+import com.quorum.tessera.api.filter.PrivateApi;
+import com.quorum.tessera.config.Peer;
+import com.quorum.tessera.core.config.ConfigService;
+import java.net.URI;
+import java.util.List;
+import java.util.Objects;
+import javax.validation.Valid;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+
+@PrivateApi
+@Path("/config")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+public class ConfigResource {
+
+    private final ConfigService configService;
+
+    public ConfigResource(ConfigService configService) {
+        this.configService = Objects.requireNonNull(configService);
+    }
+
+    @PUT
+    @Path("/peers")
+    public Response addPeer(@Valid Peer peer) {
+        
+        configService.addPeer(peer.getUrl());
+        
+        int index = configService.getPeers().size() - 1;
+
+        URI uri = UriBuilder.fromPath("config")
+                .path("peers")
+                .path(String.valueOf(index))
+                .build();
+        return Response.created(uri).build();
+    }
+
+    @GET
+    @Path("/peers/{index}")
+    public Response getPeer(@PathParam("index") Integer index) {
+
+        List<Peer> peers = configService.getPeers();
+        if (peers.size() <= index) {
+            throw new NotFoundException("No peer found at index "+ index);
+        }
+        return Response.ok(peers.get(index)).build();
+    }
+
+}
diff --git a/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/AutoDiscoveryDisabledExceptionMapper.java b/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/AutoDiscoveryDisabledExceptionMapper.java
index 2c7cafb3f0..7728e038ca 100644
--- a/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/AutoDiscoveryDisabledExceptionMapper.java
+++ b/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/AutoDiscoveryDisabledExceptionMapper.java
@@ -1,6 +1,7 @@
 package com.quorum.tessera.api.exception;
 
 import com.quorum.tessera.node.AutoDiscoveryDisabledException;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
@@ -12,6 +13,7 @@ public class AutoDiscoveryDisabledExceptionMapper implements ExceptionMapper<Aut
     public Response toResponse(AutoDiscoveryDisabledException exception) {
         return Response.status(Response.Status.FORBIDDEN)
                 .entity(exception.getMessage())
+                .type(MediaType.TEXT_PLAIN)
                 .build();
     }
 
diff --git a/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/DecodingExceptionMapper.java b/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/DecodingExceptionMapper.java
index 6ddc84ddf3..ac11794c49 100644
--- a/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/DecodingExceptionMapper.java
+++ b/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/DecodingExceptionMapper.java
@@ -20,7 +20,7 @@ public Response toResponse(final DecodingException e) {
 
         return Response.status(Response.Status.BAD_REQUEST)
             .entity(e.getMessage())
-            .header("Content-Type", MediaType.TEXT_PLAIN)
+            .type(MediaType.TEXT_PLAIN)
             .build();
     }
 }
diff --git a/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/DefaultExceptionMapper.java b/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/DefaultExceptionMapper.java
index 37247e8a18..217578ced1 100644
--- a/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/DefaultExceptionMapper.java
+++ b/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/DefaultExceptionMapper.java
@@ -1,5 +1,6 @@
 package com.quorum.tessera.api.exception;
 
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
@@ -19,6 +20,7 @@ public Response toResponse(Exception exception) {
         
         return Response.status(Status.INTERNAL_SERVER_ERROR)
                 .entity(exception.getMessage())
+                .type(MediaType.TEXT_PLAIN)
                 .build();
     }
 }
diff --git a/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/EntityNotFoundExceptionMapper.java b/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/EntityNotFoundExceptionMapper.java
index afaba8309d..ff6b40d1df 100644
--- a/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/EntityNotFoundExceptionMapper.java
+++ b/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/EntityNotFoundExceptionMapper.java
@@ -1,6 +1,7 @@
 package com.quorum.tessera.api.exception;
 
 import javax.persistence.EntityNotFoundException;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
@@ -10,8 +11,10 @@ public class EntityNotFoundExceptionMapper implements ExceptionMapper<EntityNotF
 
     @Override
     public Response toResponse(EntityNotFoundException e) {
-       
-        return Response.status(404).entity(e.getMessage()).build();
+        return Response.status(404)
+                .entity(e.getMessage())
+                .type(MediaType.TEXT_PLAIN)
+                .build();
         
     }
     
diff --git a/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/KeyNotFoundExceptionMapper.java b/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/KeyNotFoundExceptionMapper.java
index 785503696c..e310607551 100644
--- a/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/KeyNotFoundExceptionMapper.java
+++ b/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/KeyNotFoundExceptionMapper.java
@@ -21,7 +21,7 @@ public Response toResponse(final KeyNotFoundException e) {
         //TODO: change to 404
         return Response.status(Response.Status.BAD_REQUEST)
             .entity(e.getMessage())
-            .header("Content-Type", MediaType.TEXT_PLAIN)
+            .type(MediaType.TEXT_PLAIN)
             .build();
     }
 }
diff --git a/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/NotFoundExceptionMapper.java b/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/NotFoundExceptionMapper.java
index a07fe66b1f..58ff0538c5 100644
--- a/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/NotFoundExceptionMapper.java
+++ b/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/NotFoundExceptionMapper.java
@@ -1,6 +1,7 @@
 package com.quorum.tessera.api.exception;
 
 import javax.ws.rs.NotFoundException;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
@@ -13,6 +14,7 @@ public class NotFoundExceptionMapper implements ExceptionMapper<NotFoundExceptio
     public Response toResponse(NotFoundException e) {
         return Response.status(Status.NOT_FOUND)
                 .entity(e.getMessage())
+                .type(MediaType.TEXT_PLAIN)
                 .build();
     }
     
diff --git a/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/TransactionNotFoundExceptionMapper.java b/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/TransactionNotFoundExceptionMapper.java
index 922562c2d3..adb65e0441 100644
--- a/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/TransactionNotFoundExceptionMapper.java
+++ b/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/TransactionNotFoundExceptionMapper.java
@@ -20,7 +20,7 @@ public Response toResponse(final TransactionNotFoundException e) {
 
         return Response.status(Response.Status.NOT_FOUND)
             .entity(e.getMessage())
-            .header("Content-Type", MediaType.TEXT_PLAIN)
+            .type(MediaType.TEXT_PLAIN)
             .build();
     }
 
diff --git a/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/WebApplicationExceptionMapper.java b/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/WebApplicationExceptionMapper.java
index 3e0ca26f04..8972b443d0 100644
--- a/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/WebApplicationExceptionMapper.java
+++ b/jaxrs-service/src/main/java/com/quorum/tessera/api/exception/WebApplicationExceptionMapper.java
@@ -4,6 +4,7 @@
 import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.xml.bind.UnmarshalException;
@@ -25,10 +26,16 @@ public Response toResponse(final WebApplicationException exception) {
 
         } catch (final UnmarshalException ex) {
             LOGGER.warn("Unable to unmarshal payload");
-            return Response.status(Response.Status.BAD_REQUEST).entity(exception.getMessage()).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(exception.getMessage())
+                    .type(MediaType.TEXT_PLAIN)
+                    .build();
 
         } catch (final Throwable ex) {
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(exception.getMessage()).build();
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR)
+                    .entity(exception.getMessage())
+                    .type(MediaType.TEXT_PLAIN)
+                    .build();
 
         }
 
diff --git a/jaxrs-service/src/main/java/com/quorum/tessera/api/filter/IPWhitelistFilter.java b/jaxrs-service/src/main/java/com/quorum/tessera/api/filter/IPWhitelistFilter.java
index 01177ad13c..7334176b7d 100644
--- a/jaxrs-service/src/main/java/com/quorum/tessera/api/filter/IPWhitelistFilter.java
+++ b/jaxrs-service/src/main/java/com/quorum/tessera/api/filter/IPWhitelistFilter.java
@@ -1,76 +1,76 @@
 package com.quorum.tessera.api.filter;
 
-import com.quorum.tessera.config.Config;
 import com.quorum.tessera.config.Peer;
+import com.quorum.tessera.core.config.ConfigService;
+import com.quorum.tessera.io.IOCallback;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerRequestFilter;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
-import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
- * Applies a filter to all endpoints that only allows certain IP address and ghost names to
- * get access to the HTTP endpoints
+ * Applies a filter to all endpoints that only allows certain IP address and
+ * ghost names to get access to the HTTP endpoints
  *
- * If an error occurs whilst checking the whitelist,
- * the filter is disabled. This is done since not all webservers have support for
- * the {@link HttpServletRequest} context class, which is required.
+ * If an error occurs whilst checking the whitelist, the filter is disabled.
+ * This is done since not all webservers have support for the
+ * {@link HttpServletRequest} context class, which is required.
  */
 @GlobalFilter
 public class IPWhitelistFilter implements ContainerRequestFilter {
 
-    private final Set<String> whitelisted;
+    private static final Logger LOGGER = LoggerFactory.getLogger(IPWhitelistFilter.class);
+    
+    private final ConfigService configService;
 
+    //private final Set<String> whitelisted;
     private boolean disabled;
 
     private HttpServletRequest httpServletRequest;
 
-    public IPWhitelistFilter(final Config configuration) {
-
-        this.whitelisted = configuration
-            .getPeers()
-            .stream()
-            .map(Peer::getUrl)
-            .map(s -> {
-                try {
-                    return new URL(s);
-                } catch (final MalformedURLException ex) {
-                    throw new RuntimeException(ex);
-                }
-            }).map(URL::getHost)
-            .collect(Collectors.toSet());
-
-        //add ourself to the whitelist to let the unix socket in
-        //don't use the advertised address, as we only want to talk to ourselves
-        this.whitelisted.add("127.0.0.1");
-
-        this.disabled = !configuration.isUseWhiteList();
+    public IPWhitelistFilter(ConfigService configService) {
+        this.configService = Objects.requireNonNull(configService);
+        this.disabled = !configService.isUseWhiteList();
     }
 
     /**
-     * If the filter is disabled, return immediately
-     * Otherwise, extract the callers hostname and address, and check it against the whitelist
+     * If the filter is disabled, return immediately Otherwise, extract the
+     * callers hostname and address, and check it against the whitelist
      *
      * If a problem occurs, then disable the filter
      *
-     * If the host is not whitelisted, finish the filter chain here and return an Unauthorized response
+     * If the host is not whitelisted, finish the filter chain here and return
+     * an Unauthorized response
      *
      * @param requestContext the context of the current request
      */
     @Override
     public void filter(final ContainerRequestContext requestContext) {
 
-        if(disabled) {
+        if (disabled) {
             return;
         }
 
         try {
 
+            final Set<String> whitelisted = configService.getPeers().stream()
+                    .map(Peer::getUrl)
+                    .map(s -> IOCallback.execute(() -> new URL(s)))
+                    .map(URL::getHost)
+                    .collect(Collectors.toSet());
+
+            //add ourself to the whitelist to let the unix socket in
+            //don't use the advertised address, as we only want to talk to ourselves
+            whitelisted.add("127.0.0.1");
+
             final String remoteAddress = httpServletRequest.getRemoteAddr();
             final String remoteHost = httpServletRequest.getRemoteHost();
 
@@ -81,6 +81,7 @@ public void filter(final ContainerRequestContext requestContext) {
             }
 
         } catch (final Exception ex) {
+            LOGGER.error("Unexpected error while processing request.", ex);
             this.disabled = true;
         }
 
diff --git a/jaxrs-service/src/main/java/com/quorum/tessera/client/RestP2pClientFactory.java b/jaxrs-service/src/main/java/com/quorum/tessera/client/RestP2pClientFactory.java
index 30971ee99e..38cbe8513f 100644
--- a/jaxrs-service/src/main/java/com/quorum/tessera/client/RestP2pClientFactory.java
+++ b/jaxrs-service/src/main/java/com/quorum/tessera/client/RestP2pClientFactory.java
@@ -2,6 +2,7 @@
 
 import com.quorum.tessera.config.CommunicationType;
 import com.quorum.tessera.config.Config;
+import com.quorum.tessera.jaxrs.client.ClientFactory;
 import com.quorum.tessera.ssl.context.ClientSSLContextFactory;
 import com.quorum.tessera.ssl.context.SSLContextFactory;
 import javax.ws.rs.client.Client;
diff --git a/jaxrs-service/src/main/resources/tessera-jaxrs-spring.xml b/jaxrs-service/src/main/resources/tessera-jaxrs-spring.xml
index 4b7e3759b4..0b9cc3deb2 100644
--- a/jaxrs-service/src/main/resources/tessera-jaxrs-spring.xml
+++ b/jaxrs-service/src/main/resources/tessera-jaxrs-spring.xml
@@ -24,6 +24,10 @@
         <constructor-arg ref="partyInfoService"/>
         <constructor-arg ref="partyInfoParser" />
     </bean>
+    
+    <bean class="com.quorum.tessera.api.ConfigResource">
+        <constructor-arg ref="configService" />
+    </bean>
 
     <bean name="postDelegate" class="com.quorum.tessera.client.PostDelegate">
         <constructor-arg>
@@ -37,7 +41,7 @@
 
 
 
-    <bean name="clientFactory" class="com.quorum.tessera.client.ClientFactory">
+    <bean name="clientFactory" class="com.quorum.tessera.jaxrs.client.ClientFactory">
         <constructor-arg>
             <bean class="com.quorum.tessera.ssl.context.ClientSSLContextFactory" factory-method="create"/>
         </constructor-arg>
@@ -46,7 +50,7 @@
     <bean class="com.quorum.tessera.api.filter.LoggingFilter"/>
 
     <bean class="com.quorum.tessera.api.filter.IPWhitelistFilter">
-        <constructor-arg ref="config"/>
+        <constructor-arg ref="configService"/>
     </bean>
 
     <bean class="com.quorum.tessera.api.filter.PrivateApiFilter" />
diff --git a/jaxrs-service/src/test/java/com/quorum/tessera/api/ConfigResourceTest.java b/jaxrs-service/src/test/java/com/quorum/tessera/api/ConfigResourceTest.java
new file mode 100644
index 0000000000..9ed0ab7c2e
--- /dev/null
+++ b/jaxrs-service/src/test/java/com/quorum/tessera/api/ConfigResourceTest.java
@@ -0,0 +1,84 @@
+package com.quorum.tessera.api;
+
+import com.quorum.tessera.config.Peer;
+import com.quorum.tessera.core.config.ConfigService;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.core.Response;
+import static org.assertj.core.api.Assertions.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.mockito.ArgumentMatchers.anyString;
+import org.mockito.Mockito;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+public class ConfigResourceTest {
+
+    private ConfigResource configResource;
+
+    private ConfigService configService;
+
+    @Before
+    public void onSetUp() {
+        configService = mock(ConfigService.class);
+        configResource = new ConfigResource(configService);
+    }
+
+    @After
+    public void onTearDown() {
+        verifyNoMoreInteractions(configService);
+    }
+
+    @Test
+    public void addPeerIsSucessful() {
+
+        List<Peer> peers = new ArrayList<>();
+        Mockito.doAnswer((inv) -> {
+            peers.add(new Peer(inv.getArgument(0)));
+            return null;
+        }).when(configService).addPeer(anyString());
+        when(configService.getPeers()).thenReturn(peers);
+
+        Peer peer = new Peer("junit");
+
+        Response response = configResource.addPeer(peer);
+        assertThat(response.getStatus()).isEqualTo(201);
+        assertThat(response.getLocation().toString()).isEqualTo("config/peers/0");
+        assertThat(peers).containsExactly(peer);
+        verify(configService).addPeer(peer.getUrl());
+        verify(configService).getPeers();
+    }
+
+    @Test
+    public void getPeerIsSucessful() {
+        Peer peer = new Peer("getPeerIsSucessfulUrl");
+        when(configService.getPeers()).thenReturn(Arrays.asList(peer));
+
+        Response response = configResource.getPeer(0);
+
+        assertThat(response.getStatus()).isEqualTo(200);
+        assertThat(response.getEntity()).isEqualTo(peer);
+
+        verify(configService).getPeers();
+
+    }
+
+    @Test
+    public void getPeerNotFound() {
+        Peer peer = new Peer("getPeerNoptFound");
+        when(configService.getPeers()).thenReturn(Arrays.asList(peer));
+
+        try {
+            configResource.getPeer(2);
+            failBecauseExceptionWasNotThrown(NotFoundException.class);
+        } catch (NotFoundException ex) {
+            verify(configService).getPeers();
+        }
+    }
+}
diff --git a/jaxrs-service/src/test/java/com/quorum/tessera/api/filter/IPWhitelistFilterTest.java b/jaxrs-service/src/test/java/com/quorum/tessera/api/filter/IPWhitelistFilterTest.java
index 61c0c8caf0..9a2dcf2070 100644
--- a/jaxrs-service/src/test/java/com/quorum/tessera/api/filter/IPWhitelistFilterTest.java
+++ b/jaxrs-service/src/test/java/com/quorum/tessera/api/filter/IPWhitelistFilterTest.java
@@ -1,8 +1,7 @@
 package com.quorum.tessera.api.filter;
 
-import com.quorum.tessera.config.Config;
 import com.quorum.tessera.config.Peer;
-import com.quorum.tessera.config.ServerConfig;
+import com.quorum.tessera.core.config.ConfigService;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
@@ -10,14 +9,11 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.core.Response;
-import java.net.MalformedURLException;
-import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import java.util.Collections;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.mockito.Mockito.*;
 
 public class IPWhitelistFilterTest {
@@ -26,36 +22,30 @@ public class IPWhitelistFilterTest {
 
     private IPWhitelistFilter filter;
 
+    
     @Before
     public void init() throws URISyntaxException, UnknownHostException {
 
         this.ctx = mock(ContainerRequestContext.class);
 
-        final Config configuration = mock(Config.class);
+        final ConfigService configService = mock(ConfigService.class);
 
         Peer peer = new Peer("http://whitelistedHost:8080");
-        when(configuration.getPeers()).thenReturn(Collections.singletonList(peer));
-        when(configuration.isUseWhiteList()).thenReturn(true);
+        when(configService.getPeers()).thenReturn(Collections.singletonList(peer));
+        when(configService.isUseWhiteList()).thenReturn(true);
 
-        final ServerConfig serverConfig = mock(ServerConfig.class);
-        when(serverConfig.getBindingAddress()).thenReturn("http://localhost:8080");
-        when(configuration.getServerConfig()).thenReturn(serverConfig);
-
-        this.filter = new IPWhitelistFilter(configuration);
+        this.filter = new IPWhitelistFilter(configService);
 
     }
 
     @Test
     public void disabledFilterAllowsAllRequests() throws URISyntaxException, UnknownHostException {
-        final Config configuration = mock(Config.class);
-        when(configuration.getPeers()).thenReturn(Collections.emptyList());
-        when(configuration.isUseWhiteList()).thenReturn(false);
+        final ConfigService configService = mock(ConfigService.class);
+        when(configService.getPeers()).thenReturn(Collections.emptyList());
+        when(configService.isUseWhiteList()).thenReturn(false);
 
-        final ServerConfig serverConfig = mock(ServerConfig.class);
-        when(serverConfig.getBindingAddress()).thenReturn("http://localhost:8080");
-        when(configuration.getServerConfig()).thenReturn(serverConfig);
 
-        final IPWhitelistFilter filter = new IPWhitelistFilter(configuration);
+        final IPWhitelistFilter filter = new IPWhitelistFilter(configService);
 
         final HttpServletRequest request = mock(HttpServletRequest.class);
         doReturn("someotherhost").when(request).getRemoteAddr();
@@ -148,25 +138,6 @@ public void selfIsWhitelisted() {
         verifyZeroInteractions(ctx);
     }
 
-    @Test
-    public void invalidPeerCantBeWhitelisted() throws URISyntaxException {
-        final Config configuration = mock(Config.class);
-
-        Peer peer = new Peer("ht:whitelistedHost:8080");
-        when(configuration.getPeers()).thenReturn(Collections.singletonList(peer));
-        when(configuration.isUseWhiteList()).thenReturn(true);
-
-        final ServerConfig serverConfig = mock(ServerConfig.class);
-        when(serverConfig.getServerUri()).thenReturn(new URI("http://localhost:8080"));
-        when(configuration.getServerConfig()).thenReturn(serverConfig);
 
-        final Throwable throwable = catchThrowable(() -> new IPWhitelistFilter(configuration));
-
-        assertThat(throwable)
-            .isInstanceOf(RuntimeException.class)
-            .hasCauseExactlyInstanceOf(MalformedURLException.class);
-
-        assertThat(throwable.getCause()).hasMessage("unknown protocol: ht");
-    }
 
 }
diff --git a/pom.xml b/pom.xml
index ad8217b5bb..3fe14b39f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,18 +220,18 @@
             </plugin>
 
             <plugin>
-              <groupId>org.ec4j.maven</groupId>
-              <artifactId>editorconfig-maven-plugin</artifactId>
-              <version>0.0.5</version>
-              <executions>
-                <execution>
-                  <id>check</id>
-                  <phase>verify</phase>
-                  <goals>
-                    <goal>check</goal>
-                  </goals>
-                </execution>
-              </executions>
+                <groupId>org.ec4j.maven</groupId>
+                <artifactId>editorconfig-maven-plugin</artifactId>
+                <version>0.0.5</version>
+                <executions>
+                    <execution>
+                        <id>check</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
 
         </plugins>
@@ -257,6 +257,7 @@
         <module>grpc-service</module>
         <module>jaxrs-service</module>
         <module>tessera-core</module>
+        <module>jaxrs-client</module>
         <module>key-generation</module>
     </modules>
 
@@ -398,6 +399,12 @@
                 <version>0.7-SNAPSHOT</version>
             </dependency>
         
+            <dependency>
+                <groupId>com.quorum.tessera</groupId>
+                <artifactId>jaxrs-client</artifactId>
+                <version>0.7-SNAPSHOT</version>
+            </dependency>
+        
             <dependency>
                 <groupId>org.glassfish.jersey</groupId>
                 <artifactId>jersey-bom</artifactId>
@@ -719,7 +726,7 @@
     <dependencies>
 
         <!-- Needed for JavaDoc plugin -->
-<!--        <dependency>
+        <!--        <dependency>
             <groupId>javax.interceptor</groupId>
             <artifactId>javax.interceptor-api</artifactId>
         </dependency>
diff --git a/tessera-app/src/main/java/com/quorum/tessera/Launcher.java b/tessera-app/src/main/java/com/quorum/tessera/Launcher.java
index ec7425053e..8ee2df9306 100644
--- a/tessera-app/src/main/java/com/quorum/tessera/Launcher.java
+++ b/tessera-app/src/main/java/com/quorum/tessera/Launcher.java
@@ -30,13 +30,13 @@ public static void main(final String... args) throws Exception {
         try {
             final CliResult cliResult = CliDelegate.instance().execute(args);
 
-            if (cliResult.isHelpOn()) {
+            if (cliResult.isSuppressStartup()) {
                 System.exit(0);
             } else if (cliResult.getStatus() != 0) {
                 System.exit(cliResult.getStatus());
             }
 
-            if (!cliResult.getConfig().isPresent() && cliResult.isKeyGenOn()) {
+            if (!cliResult.getConfig().isPresent() && cliResult.isSuppressStartup()) {
                 System.exit(cliResult.getStatus());
             }
 
diff --git a/tessera-core/src/main/java/com/quorum/tessera/core/config/ConfigService.java b/tessera-core/src/main/java/com/quorum/tessera/core/config/ConfigService.java
index 75607ec1d1..53af720a75 100644
--- a/tessera-core/src/main/java/com/quorum/tessera/core/config/ConfigService.java
+++ b/tessera-core/src/main/java/com/quorum/tessera/core/config/ConfigService.java
@@ -1,9 +1,19 @@
 package com.quorum.tessera.core.config;
 
-import com.quorum.tessera.config.Config;
+import com.quorum.tessera.config.Peer;
+import java.net.URI;
+import java.util.List;
 
 public interface ConfigService {
+
+    void addPeer(String url);
+    
+    List<Peer> getPeers();
+
+    boolean isUseWhiteList();
+
+    boolean isDisablePeerDiscovery();
     
-    Config getConfig();
+    URI getServerUri();
      
 }
diff --git a/tessera-core/src/main/java/com/quorum/tessera/core/config/ConfigServiceImpl.java b/tessera-core/src/main/java/com/quorum/tessera/core/config/ConfigServiceImpl.java
index 4dab98c8b0..fcf67fd3c9 100644
--- a/tessera-core/src/main/java/com/quorum/tessera/core/config/ConfigServiceImpl.java
+++ b/tessera-core/src/main/java/com/quorum/tessera/core/config/ConfigServiceImpl.java
@@ -1,20 +1,48 @@
 package com.quorum.tessera.core.config;
 
 import com.quorum.tessera.config.Config;
+import com.quorum.tessera.config.Peer;
+import com.quorum.tessera.config.util.ConfigFileStore;
+import java.net.URI;
+import java.util.List;
 import java.util.Objects;
 
-
 public class ConfigServiceImpl implements ConfigService {
     
     private final Config config;
 
-    public ConfigServiceImpl(Config initialConfig) {
+    private final ConfigFileStore configFileStore;
+    
+    public ConfigServiceImpl(Config initialConfig,ConfigFileStore configFileStore) {
         this.config = Objects.requireNonNull(initialConfig);
+        this.configFileStore = Objects.requireNonNull(configFileStore);
+    }
+ 
+    
+    @Override
+    public void addPeer(String url) {
+        this.config.addPeer(new Peer(url));
+        configFileStore.save(config);                
+    }
+
+    @Override
+    public List<Peer> getPeers() {
+        return config.getPeers();
+    }
+
+    @Override
+    public boolean isUseWhiteList() {
+        return config.isUseWhiteList();
+    }
+
+    @Override
+    public boolean isDisablePeerDiscovery() {
+        return config.isDisablePeerDiscovery();
     }
 
     @Override
-    public Config getConfig() {
-        return config;
+    public URI getServerUri() {
+        return config.getServerConfig().getServerUri();
     }
 
 }
diff --git a/tessera-core/src/main/java/com/quorum/tessera/node/PartyInfoPoller.java b/tessera-core/src/main/java/com/quorum/tessera/node/PartyInfoPoller.java
index c0dd01a4b8..47db8914d7 100644
--- a/tessera-core/src/main/java/com/quorum/tessera/node/PartyInfoPoller.java
+++ b/tessera-core/src/main/java/com/quorum/tessera/node/PartyInfoPoller.java
@@ -54,14 +54,15 @@ public void run() {
 
         partyInfo
                 .getParties()
-                .parallelStream()
+                .stream()
                 .filter(party -> !party.getUrl().equals(partyInfo.getUrl()))
                 .map(Party::getUrl)
                 .map(url -> pollSingleParty(url, encodedPartyInfo))
                 .filter(Objects::nonNull)
                 .map(partyInfoParser::from)
                 .forEach(newPartyInfo -> {
-                    this.resendForNewKeys(newPartyInfo);
+                    Set<Party> newPartiesFound = partyInfoService.findUnsavedParties(newPartyInfo);
+                    resendPartyStore.addUnseenParties(newPartiesFound);
                     partyInfoService.updatePartyInfo(newPartyInfo);
                 });
 
@@ -97,9 +98,6 @@ private byte[] pollSingleParty(final String url, final byte[] encodedPartyInfo)
 
     }
 
-    private void resendForNewKeys(final PartyInfo receivedPartyInfo) {
-        final Set<Party> newPartiesFound = this.partyInfoService.findUnsavedParties(receivedPartyInfo);
-        this.resendPartyStore.addUnseenParties(newPartiesFound);
-    }
+
 
 }
diff --git a/tessera-core/src/main/java/com/quorum/tessera/node/PartyInfoService.java b/tessera-core/src/main/java/com/quorum/tessera/node/PartyInfoService.java
index 9de1dcd833..a64e6fab5f 100644
--- a/tessera-core/src/main/java/com/quorum/tessera/node/PartyInfoService.java
+++ b/tessera-core/src/main/java/com/quorum/tessera/node/PartyInfoService.java
@@ -16,10 +16,10 @@ public interface PartyInfoService {
     PartyInfo getPartyInfo();
 
     /**
-     * Update the PartyInfo data store with the provided encoded data.
-     * This can happen when endpoint /partyinfo is triggered,
-     * or by a response from this node hitting another node /partyinfo endpoint
+     * Update the PartyInfo data store with the provided encoded data.This can happen when endpoint /partyinfo is triggered,
+ or by a response from this node hitting another node /partyinfo endpoint
      *
+     * @param partyInfo
      * @return updated PartyInfo object
      */
     PartyInfo updatePartyInfo(PartyInfo partyInfo);
diff --git a/tessera-core/src/main/java/com/quorum/tessera/node/PartyInfoServiceImpl.java b/tessera-core/src/main/java/com/quorum/tessera/node/PartyInfoServiceImpl.java
index 3242e10ccc..b6f477cd31 100644
--- a/tessera-core/src/main/java/com/quorum/tessera/node/PartyInfoServiceImpl.java
+++ b/tessera-core/src/main/java/com/quorum/tessera/node/PartyInfoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.quorum.tessera.node;
 
-import com.quorum.tessera.config.Config;
 import com.quorum.tessera.config.Peer;
 import com.quorum.tessera.core.config.ConfigService;
 import com.quorum.tessera.key.KeyManager;
@@ -15,6 +14,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.toSet;
 import org.slf4j.Logger;
@@ -25,30 +25,29 @@ public class PartyInfoServiceImpl implements PartyInfoService {
     private final PartyInfoStore partyInfoStore;
 
     private final ConfigService configService;
-        
+
     private static final Logger LOGGER = LoggerFactory.getLogger(PartyInfoServiceImpl.class);
-    
+
     public PartyInfoServiceImpl(final PartyInfoStore partyInfoStore,
-                                final ConfigService configService,
-                                final KeyManager keyManager) {
+            final ConfigService configService,
+            final KeyManager keyManager) {
         this.partyInfoStore = Objects.requireNonNull(partyInfoStore);
         this.configService = Objects.requireNonNull(configService);
-        
-        final Config configuration = configService.getConfig();
-        final String advertisedUrl = configuration.getServerConfig().getServerUri().toString();
 
-        final Set<Party> initialParties = configuration
-            .getPeers()
-            .stream()
-            .map(Peer::getUrl)
-            .map(Party::new)
-            .collect(toSet());
+        final String advertisedUrl = configService.getServerUri().toString();
+
+        final Set<Party> initialParties = configService
+                .getPeers()
+                .stream()
+                .map(Peer::getUrl)
+                .map(Party::new)
+                .collect(toSet());
 
         final Set<Recipient> ourKeys = keyManager
-            .getPublicKeys()
-            .stream()
-            .map(key -> new Recipient(key, advertisedUrl))
-            .collect(toSet());
+                .getPublicKeys()
+                .stream()
+                .map(key -> new Recipient(key, advertisedUrl))
+                .collect(toSet());
 
         partyInfoStore.store(new PartyInfo(advertisedUrl, ourKeys, initialParties));
     }
@@ -60,19 +59,19 @@ public PartyInfo getPartyInfo() {
 
     @Override
     public PartyInfo updatePartyInfo(final PartyInfo partyInfo) {
-        
-        if(configService.getConfig().isDisablePeerDiscovery()) {
-            
+
+        if (configService.isDisablePeerDiscovery()) {
+
             PartyInfo currentPartyInfo = getPartyInfo();
-            
-            if(!Objects.equals(currentPartyInfo.getParties(), partyInfo.getParties())) {
+
+            if (!Objects.equals(currentPartyInfo.getParties(), partyInfo.getParties())) {
                 final String message = String.format("Parties found in party info from %s are different.", partyInfo.getUrl());
                 throw new AutoDiscoveryDisabledException(message);
             }
-            
+
             Predicate<String> matchUrl = u -> Objects.equals(u, partyInfo.getUrl());
-            
-            if(!currentPartyInfo.getParties().stream()
+
+            if (!currentPartyInfo.getParties().stream()
                     .map(Party::getUrl)
                     .anyMatch(matchUrl)) {
                 final String message = String.format("Peer %s not found in known peer list", partyInfo.getUrl());
@@ -81,7 +80,30 @@ public PartyInfo updatePartyInfo(final PartyInfo partyInfo) {
 
         }
 
-        partyInfoStore.store(partyInfo);
+        //TODO: Review whether this is the best place
+        //Compare peers to parties if any new peers are detected then add them to part info
+        Set<String> peerUrls = configService.getPeers().stream()
+                .map(Peer::getUrl)
+                .collect(Collectors.toSet());
+
+        Set<String> partyUrls = partyInfo.getParties().stream()
+                .map(Party::getUrl)
+                .collect(Collectors.toSet());
+
+        peerUrls.removeAll(partyUrls);
+
+        if (!peerUrls.isEmpty()) {
+            LOGGER.info("Adding new parties from config update. {}", peerUrls);
+        }
+
+        Set<Party> newParties = new HashSet<>(partyInfo.getParties());
+        peerUrls.stream().map(Party::new).forEach(newParties::add);
+
+        partyInfoStore.store(new PartyInfo(partyInfo.getUrl(), partyInfo.getRecipients(), newParties));
+
+        if (!peerUrls.isEmpty()) {
+            LOGGER.info("Added new parties. {}", peerUrls);
+        }
 
         return this.getPartyInfo();
     }
@@ -90,12 +112,12 @@ public PartyInfo updatePartyInfo(final PartyInfo partyInfo) {
     public String getURLFromRecipientKey(final Key key) {
 
         final Recipient retrievedRecipientFromStore = partyInfoStore
-            .getPartyInfo()
-            .getRecipients()
-            .stream()
-            .filter(recipient -> key.equals(recipient.getKey()))
-            .findAny()
-            .orElseThrow(() -> new KeyNotFoundException("Recipient not found"));
+                .getPartyInfo()
+                .getRecipients()
+                .stream()
+                .filter(recipient -> key.equals(recipient.getKey()))
+                .findAny()
+                .orElseThrow(() -> new KeyNotFoundException("Recipient not found"));
 
         return retrievedRecipientFromStore.getUrl();
     }
diff --git a/tessera-core/src/main/resources/tessera-core-spring.xml b/tessera-core/src/main/resources/tessera-core-spring.xml
index 5cb06afb38..8d218f4552 100644
--- a/tessera-core/src/main/resources/tessera-core-spring.xml
+++ b/tessera-core/src/main/resources/tessera-core-spring.xml
@@ -137,6 +137,9 @@
 
     <bean id="configService" class="com.quorum.tessera.core.config.ConfigServiceImpl">
         <constructor-arg ref="config" />
+        <constructor-arg>
+            <bean class="com.quorum.tessera.config.util.ConfigFileStore" factory-method="get" />
+        </constructor-arg>
     </bean>
     
     
diff --git a/tessera-core/src/test/java/com/quorum/tessera/core/config/ConfigServiceTest.java b/tessera-core/src/test/java/com/quorum/tessera/core/config/ConfigServiceTest.java
index ac87f27de7..ee6980adca 100644
--- a/tessera-core/src/test/java/com/quorum/tessera/core/config/ConfigServiceTest.java
+++ b/tessera-core/src/test/java/com/quorum/tessera/core/config/ConfigServiceTest.java
@@ -1,34 +1,90 @@
-
 package com.quorum.tessera.core.config;
 
 import com.quorum.tessera.config.Config;
+import com.quorum.tessera.config.Peer;
+import com.quorum.tessera.config.ServerConfig;
+import com.quorum.tessera.config.util.ConfigFileStore;
+import java.net.URI;
+import java.net.URISyntaxException;
 import static org.assertj.core.api.Assertions.assertThat;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import static org.mockito.Mockito.*;
 
-
 public class ConfigServiceTest {
-    
+
     private ConfigService configService;
-    
+
     private Config config;
-    
+
+    private ConfigFileStore configFileStore;
+
     @Before
     public void onSetUp() {
         config = mock(Config.class);
-        configService = new ConfigServiceImpl(config);
+        configFileStore = mock(ConfigFileStore.class);
+        configService = new ConfigServiceImpl(config, configFileStore);
     }
-    
+
     @After
     public void onTearDown() {
-        verifyNoMoreInteractions(config);
+        verifyNoMoreInteractions(config, configFileStore);
     }
-    
+
+    @Test
+    public void isUseWhileList() {
+        when(config.isUseWhiteList()).thenReturn(false);
+
+        assertThat(configService.isUseWhiteList()).isFalse();
+
+        when(config.isUseWhiteList()).thenReturn(true);
+        assertThat(configService.isUseWhiteList()).isTrue();
+
+        verify(config, times(2)).isUseWhiteList();
+    }
+
+    @Test
+    public void addPeer() {
+        configService.addPeer("JUNIT");
+        verify(config).addPeer(new Peer("JUNIT"));
+        verify(configFileStore).save(config);
+
+    }
+
+    @Test
+    public void getPeers() {
+        configService.getPeers();
+        verify(config).getPeers();
+    }
+
     @Test
-    public void getConfig() {
-        assertThat(configService.getConfig()).isSameAs(config);
+    public void isDisablePeerDiscovery() {
+        when(config.isDisablePeerDiscovery()).thenReturn(false);
+
+        assertThat(configService.isDisablePeerDiscovery()).isFalse();
+
+        when(config.isDisablePeerDiscovery()).thenReturn(true);
+        assertThat(configService.isDisablePeerDiscovery()).isTrue();
+
+        verify(config, times(2)).isDisablePeerDiscovery();
     }
     
+    @Test
+    public void getServerUri() throws URISyntaxException {
+        ServerConfig serverConfig = mock(ServerConfig.class);
+        URI serverUri = new URI("someuri");
+        when(serverConfig.getServerUri()).thenReturn(serverUri);
+        
+        when(config.getServerConfig()).thenReturn(serverConfig);
+        
+        URI result = configService.getServerUri();
+        
+        assertThat(result).isSameAs(serverUri);
+        
+        verify(config).getServerConfig();
+        verify(serverConfig).getServerUri();
+        
+    }
+
 }
diff --git a/tessera-core/src/test/java/com/quorum/tessera/node/PartyInfoServiceTest.java b/tessera-core/src/test/java/com/quorum/tessera/node/PartyInfoServiceTest.java
index 0da37a321d..faf86206bd 100644
--- a/tessera-core/src/test/java/com/quorum/tessera/node/PartyInfoServiceTest.java
+++ b/tessera-core/src/test/java/com/quorum/tessera/node/PartyInfoServiceTest.java
@@ -1,8 +1,6 @@
 package com.quorum.tessera.node;
 
-import com.quorum.tessera.config.Config;
 import com.quorum.tessera.config.Peer;
-import com.quorum.tessera.config.ServerConfig;
 import com.quorum.tessera.core.config.ConfigService;
 import com.quorum.tessera.key.KeyManager;
 import com.quorum.tessera.key.exception.KeyNotFoundException;
@@ -10,6 +8,8 @@
 import com.quorum.tessera.node.model.Party;
 import com.quorum.tessera.node.model.PartyInfo;
 import com.quorum.tessera.node.model.Recipient;
+import java.net.URI;
+import java.net.URISyntaxException;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -36,8 +36,7 @@ public class PartyInfoServiceTest {
 
     private PartyInfoStore partyInfoStore;
 
-    private Config configuration;
-
+    //   private Config configuration;
     private ConfigService configService;
 
     private KeyManager keyManager;
@@ -45,21 +44,16 @@ public class PartyInfoServiceTest {
     private PartyInfoService partyInfoService;
 
     @Before
-    public void onSetUp() {
+    public void onSetUp() throws URISyntaxException {
 
         this.partyInfoStore = mock(PartyInfoStore.class);
-        this.configuration = mock(Config.class);
         this.keyManager = mock(KeyManager.class);
         this.configService = mock(ConfigService.class);
 
-        when(configService.getConfig()).thenReturn(configuration);
-
-        final ServerConfig serverConfig = new ServerConfig("http://localhost", 8080, 50521, null, null, null, null);
-
-        when(configuration.getServerConfig()).thenReturn(serverConfig);
+        doReturn(new URI(URI)).when(configService).getServerUri();
 
         final Peer peer = new Peer("http://other-node.com:8080");
-        when(configuration.getPeers()).thenReturn(singletonList(peer));
+        when(configService.getPeers()).thenReturn(singletonList(peer));
 
         final Set<Key> ourKeys = new HashSet<>(
                 Arrays.asList(
@@ -76,14 +70,14 @@ public void onSetUp() {
     public void after() {
         //Called in constructor
         verify(keyManager).getPublicKeys();
-        verify(configuration).getPeers();
-        verify(configuration).getServerConfig();
+        verify(configService, atLeast(1)).getPeers();
+        verify(configService).getServerUri();
 
         verify(partyInfoStore, atLeast(1)).store(any(PartyInfo.class));
 
         verifyNoMoreInteractions(partyInfoStore);
         verifyNoMoreInteractions(keyManager);
-        verifyNoMoreInteractions(configuration);
+        verifyNoMoreInteractions(configService);
     }
 
     @Test
@@ -113,8 +107,7 @@ public void registeringPublicKeysUsesOurUrl() {
 
         verify(partyInfoStore).store(captor.capture());
         verify(keyManager).getPublicKeys();
-        verify(configuration).getPeers();
-        verify(configuration).getServerConfig();
+        verify(configService).getPeers();
 
         final List<Recipient> allRegisteredKeys = captor
                 .getAllValues()
@@ -143,11 +136,10 @@ public void updatePartyInfoDelegatesToStore() {
         partyInfoService.updatePartyInfo(secondNodePartyInfo);
         partyInfoService.updatePartyInfo(thirdNodePartyInfo);
 
-        verify(partyInfoStore).store(secondNodePartyInfo);
-        verify(partyInfoStore).store(thirdNodePartyInfo);
         verify(partyInfoStore, times(3)).store(any(PartyInfo.class));
         verify(partyInfoStore, times(2)).getPartyInfo();
-        verify(configuration, times(2)).isDisablePeerDiscovery();
+        verify(configService, times(3)).getPeers();
+        verify(configService, times(2)).isDisablePeerDiscovery();
     }
 
     @Test
@@ -226,7 +218,7 @@ public void diffPartyInfoReturnsNodesNotInStore() {
     @Test
     public void updatePartyInfoDelegatesToStoreAutoDiscoveryDisabled() {
 
-        when(configuration.isDisablePeerDiscovery()).thenReturn(true);
+        when(configService.isDisablePeerDiscovery()).thenReturn(true);
 
         Set<Party> parties = Stream.of("MyURI", "MyOtherUri")
                 .map(Party::new).collect(Collectors.toSet());
@@ -241,7 +233,7 @@ public void updatePartyInfoDelegatesToStoreAutoDiscoveryDisabled() {
             failBecauseExceptionWasNotThrown(AutoDiscoveryDisabledException.class);
 
         } catch (AutoDiscoveryDisabledException ex) {
-            verify(configuration).isDisablePeerDiscovery();
+            verify(configService).isDisablePeerDiscovery();
             verify(partyInfoStore).getPartyInfo();
         }
     }
@@ -249,7 +241,7 @@ public void updatePartyInfoDelegatesToStoreAutoDiscoveryDisabled() {
     @Test
     public void updatePartyInfoDelegatesToStoreAutoDiscoveryDisabledDifferentParties() {
 
-        when(configuration.isDisablePeerDiscovery()).thenReturn(true);
+        when(configService.isDisablePeerDiscovery()).thenReturn(true);
 
         Set<Party> parties = Stream.of("MyURI", "MyOtherUri")
                 .map(Party::new).collect(Collectors.toSet());
@@ -260,14 +252,14 @@ public void updatePartyInfoDelegatesToStoreAutoDiscoveryDisabledDifferentParties
 
         Set<Party> otherParties = Stream.of("OtherURI", "OtherUri")
                 .map(Party::new).collect(Collectors.toSet());
-        
+
         PartyInfo forUpdate = new PartyInfo("MyOtherUri", EMPTY_SET, otherParties);
         try {
             partyInfoService.updatePartyInfo(forUpdate);
             failBecauseExceptionWasNotThrown(AutoDiscoveryDisabledException.class);
 
         } catch (AutoDiscoveryDisabledException ex) {
-            verify(configuration).isDisablePeerDiscovery();
+            verify(configService).isDisablePeerDiscovery();
             verify(partyInfoStore).getPartyInfo();
         }
 
diff --git a/tests/acceptance-test/src/test/java/com/quorum/tessera/test/rest/AdminConfigIT.java b/tests/acceptance-test/src/test/java/com/quorum/tessera/test/rest/AdminConfigIT.java
new file mode 100644
index 0000000000..b91651237b
--- /dev/null
+++ b/tests/acceptance-test/src/test/java/com/quorum/tessera/test/rest/AdminConfigIT.java
@@ -0,0 +1,52 @@
+package com.quorum.tessera.test.rest;
+
+import com.quorum.tessera.config.Peer;
+import java.net.URI;
+import java.util.UUID;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class AdminConfigIT {
+
+    private static final URI SERVER_URI = UriBuilder.fromUri("http://127.0.0.1").port(8080).build();
+
+    private static final Client client = ClientBuilder.newClient();
+
+    
+    @Test
+    public void addPeer() {
+        
+        String url = "http://"+ UUID.randomUUID().toString().replaceAll("-", "");
+        
+        Peer peer = new Peer(url);
+        
+        Response response = client.target(SERVER_URI)
+                .path("config")
+                .path("peers")
+                .request(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON).put(Entity.entity(peer, MediaType.APPLICATION_JSON));
+        
+        
+        assertThat(response.getStatus()).isEqualTo(201);
+        
+       URI location =  response.getLocation();
+        
+        Response queryResponse = client.target(location)
+                .request(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON).get();
+        
+         assertThat(queryResponse.getStatus()).isEqualTo(200);
+        
+         assertThat(queryResponse.readEntity(Peer.class)).isEqualTo(peer);
+        
+        
+    }
+    
+    
+}
diff --git a/tests/acceptance-test/src/test/java/com/quorum/tessera/test/rest/RestSuite.java b/tests/acceptance-test/src/test/java/com/quorum/tessera/test/rest/RestSuite.java
index 13584b0d97..b241779549 100644
--- a/tests/acceptance-test/src/test/java/com/quorum/tessera/test/rest/RestSuite.java
+++ b/tests/acceptance-test/src/test/java/com/quorum/tessera/test/rest/RestSuite.java
@@ -19,7 +19,8 @@
     SendIT.class,
     SendRawIT.class,
     TesseraIT.class,
-    TransactionForwardingIT.class
+    TransactionForwardingIT.class,
+    AdminConfigIT.class
 })
 public class RestSuite {