From 60bad80c5922d686b380b4987ec92ee8d4554d67 Mon Sep 17 00:00:00 2001
From: Robert Moffat <robert.moffat@db.com>
Date: Mon, 14 Sep 2020 16:22:14 +0100
Subject: [PATCH] Second commit of chat workflow

---
 NOTICE                                        |   2 +-
 bindings/pom.xml                              |   7 -
 chat-workflow/pom.xml                         |  69 ++++
 .../workflow/AbstractNeedsWorkflow.java       |  12 +
 .../symphony/workflow/AbstractWorkflow.java   | 119 ++++++
 .../symphony/workflow/Workflow.java           |  53 +++
 .../workflow/content/Addressable.java         |   5 +
 .../symphony/workflow/content/Author.java     |  13 +
 .../symphony/workflow/content/Content.java    |  35 ++
 .../symphony/workflow/content/ID.java         |  21 +
 .../symphony/workflow/content/Message.java    |  51 +++
 .../symphony/workflow/content/Paragraph.java  |  51 +++
 .../workflow/content/PastedTable.java         |  16 +
 .../symphony/workflow/content/Room.java       |  20 +
 .../symphony/workflow/content/RoomDef.java    |  71 ++++
 .../symphony/workflow/content/Tag.java        |  30 ++
 .../symphony/workflow/content/TagDef.java     |  80 ++++
 .../symphony/workflow/content/User.java       |  15 +
 .../symphony/workflow/content/UserDef.java    |  69 ++++
 .../symphony/workflow/content/Word.java       |  42 ++
 .../symphony/workflow/form/Button.java        |  42 ++
 .../symphony/workflow/history/History.java    |  15 +
 .../workflow/java/ClassBasedWorkflow.java     | 275 +++++++++++++
 .../workflow/java/ConfigurableWorkflow.java   |   8 +
 .../symphony/workflow/java/Exposed.java       |  17 +
 .../symphony/workflow/java/Work.java          |  22 +
 .../workflow/response/AttachmentResponse.java |  28 ++
 .../workflow/response/DataResponse.java       |  48 +++
 .../workflow/response/ErrorResponse.java      |  20 +
 .../workflow/response/FormResponse.java       |  69 ++++
 .../workflow/response/MessageResponse.java    |  26 ++
 .../symphony/workflow/response/Response.java  |  19 +
 .../symphony/workflow/room/Rooms.java         |  16 +
 .../workflow/sources/symphony/Action.java     |  11 +
 .../sources/symphony/SymphonyBot.java         |  49 +++
 .../symphony/SymphonyEventHandler.java        |   9 +
 .../SymphonyWorkflowComponentsConfig.java     |  54 +++
 .../symphony/SymphonyWorkflowConfig.java      | 108 +++++
 .../workflow/sources/symphony/TagSupport.java | 103 +++++
 .../elements/AbstractElementsConsumer.java    |   5 +
 .../symphony/elements/ElementsAction.java     | 104 +++++
 .../symphony/elements/ElementsConsumer.java   |  16 +
 .../symphony/elements/ElementsHandler.java    | 117 ++++++
 .../symphony/elements/FormConverter.java      | 140 +++++++
 .../elements/MethodCallElementsConsumer.java  |  32 ++
 .../symphony/elements/WorkflowModule.java     |  92 +++++
 .../edit/EditActionElementsConsumer.java      |  29 ++
 .../symphony/elements/edit/TableAddRow.java   |  65 +++
 .../elements/edit/TableDeleteRows.java        |  78 ++++
 .../symphony/elements/edit/TableEditRow.java  |  67 +++
 .../symphony/handlers/AttachmentHandler.java  |   8 +
 .../handlers/EntityJsonConverter.java         |  99 +++++
 .../handlers/FormMessageMLConverter.java      | 389 ++++++++++++++++++
 .../symphony/handlers/ResponseHandler.java    |   9 +
 .../handlers/SymphonyResponseHandler.java     |  87 ++++
 .../jersey/JerseyAttachmentHandlerConfig.java |  38 ++
 .../symphony/history/MessageHistory.java      |  80 ++++
 .../messages/HelpMessageConsumer.java         |  47 +++
 .../messages/MethodCallMessageConsumer.java   |  19 +
 .../messages/PresentationMLHandler.java       | 118 ++++++
 .../messages/SimpleMessageAction.java         |  50 +++
 .../messages/SimpleMessageConsumer.java       |  18 +
 .../messages/SimpleMessageParser.java         | 328 +++++++++++++++
 .../sources/symphony/room/SymphonyRooms.java  |  22 +
 .../symphony/room/SymphonyRoomsImpl.java      | 137 ++++++
 .../workflow/validation/ErrorHelp.java        |  41 ++
 .../main/resources/META-INF/spring.factories  |   3 +
 .../workflow/AbstractMockSymphonyTest.java    |  80 ++++
 .../workflow/TestEntityJsonConversion.java    |  79 ++++
 .../symphony/workflow/TestFormConverter.java  |  67 +++
 .../symphony/workflow/TestFormMessageML.java  | 148 +++++++
 .../symphony/workflow/TestHistory.java        |  19 +
 .../workflow/TestRoomAndUsersBuilder.java     |  97 +++++
 .../workflow/TestSimpleMessageParser.java     |  71 ++++
 .../workflow/TestSymphonyResponseHandler.java | 115 ++++++
 .../symphony/workflow/TestTableEdit.java      | 100 +++++
 .../symphony/workflow/TestWorkflow.java       |  80 ++++
 .../symphony/workflow/fixture/TestOb3.java    |  87 ++++
 .../symphony/workflow/fixture/TestOb4.java    | 118 ++++++
 .../symphony/workflow/fixture/TestObject.java | 150 +++++++
 .../workflow/fixture/TestObjects.java         |  87 ++++
 .../workflow/fixture/TestWorkflowConfig.java  |  84 ++++
 pom.xml                                       |   3 +-
 83 files changed, 5334 insertions(+), 9 deletions(-)
 create mode 100644 chat-workflow/pom.xml
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/AbstractNeedsWorkflow.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/AbstractWorkflow.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/Workflow.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Addressable.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Author.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Content.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/ID.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Message.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Paragraph.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/PastedTable.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Room.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/RoomDef.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Tag.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/TagDef.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/User.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/UserDef.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Word.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/form/Button.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/history/History.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/java/ClassBasedWorkflow.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/java/ConfigurableWorkflow.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/java/Exposed.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/java/Work.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/AttachmentResponse.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/DataResponse.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/ErrorResponse.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/FormResponse.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/MessageResponse.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/Response.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/room/Rooms.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/Action.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/SymphonyBot.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/SymphonyEventHandler.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/SymphonyWorkflowComponentsConfig.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/SymphonyWorkflowConfig.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/TagSupport.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/AbstractElementsConsumer.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/ElementsAction.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/ElementsConsumer.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/ElementsHandler.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/FormConverter.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/MethodCallElementsConsumer.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/WorkflowModule.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/edit/EditActionElementsConsumer.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/edit/TableAddRow.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/edit/TableDeleteRows.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/edit/TableEditRow.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/AttachmentHandler.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/EntityJsonConverter.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/FormMessageMLConverter.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/ResponseHandler.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/SymphonyResponseHandler.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/jersey/JerseyAttachmentHandlerConfig.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/history/MessageHistory.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/HelpMessageConsumer.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/MethodCallMessageConsumer.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/PresentationMLHandler.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/SimpleMessageAction.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/SimpleMessageConsumer.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/SimpleMessageParser.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/room/SymphonyRooms.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/room/SymphonyRoomsImpl.java
 create mode 100644 chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/validation/ErrorHelp.java
 create mode 100644 chat-workflow/src/main/resources/META-INF/spring.factories
 create mode 100644 chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/AbstractMockSymphonyTest.java
 create mode 100644 chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestEntityJsonConversion.java
 create mode 100644 chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestFormConverter.java
 create mode 100644 chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestFormMessageML.java
 create mode 100644 chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestHistory.java
 create mode 100644 chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestRoomAndUsersBuilder.java
 create mode 100644 chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestSimpleMessageParser.java
 create mode 100644 chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestSymphonyResponseHandler.java
 create mode 100644 chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestTableEdit.java
 create mode 100644 chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestWorkflow.java
 create mode 100644 chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestOb3.java
 create mode 100644 chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestOb4.java
 create mode 100644 chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestObject.java
 create mode 100644 chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestObjects.java
 create mode 100644 chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestWorkflowConfig.java

diff --git a/NOTICE b/NOTICE
index ee156852e..4ba39e80d 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
 Symphony Java Toolkit - FINOS
-Copyright 2019 - 2020 Deutsche Bank AG deutsche-symphony-practice@db.com
+Copyright 2019 - 2020 Deutsche Bank AG symphony-practice@list.db.com
 
 This product includes software developed at the Fintech Open Source Foundation (https://www.finos.org/) and Deutsche Bank AG.
diff --git a/bindings/pom.xml b/bindings/pom.xml
index e9adc6560..b93d16969 100644
--- a/bindings/pom.xml
+++ b/bindings/pom.xml
@@ -13,13 +13,6 @@
     <version>4.59.1-SNAPSHOT</version>
   </parent>
 
-  <developers>
-    <developer>
-      <name>Rob Moffat</name>
-      <email>robert.moffat@db.com</email>
-    </developer>
-  </developers>
-
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
diff --git a/chat-workflow/pom.xml b/chat-workflow/pom.xml
new file mode 100644
index 000000000..f44a1f388
--- /dev/null
+++ b/chat-workflow/pom.xml
@@ -0,0 +1,69 @@
+<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>
+  <artifactId>chat-workflow</artifactId>
+  <name>Chat Workflow</name>
+  <description>Build Workflows Using Enterprise Chat</description>
+
+  <parent>
+    <groupId>com.github.deutschebank.symphony</groupId>
+    <artifactId>symphony-java-client-parent</artifactId>
+    <version>4.59.1-SNAPSHOT</version>
+  </parent>
+
+  <properties>
+    <java.version>1.8</java.version>
+    <spring-boot.version>2.2.0.RELEASE</spring-boot.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.github.deutschebank.symphony</groupId>
+      <artifactId>symphony-api-spring-boot-starter</artifactId>
+      <version>4.59.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.github.deutschebank.symphony</groupId>
+      <artifactId>symphony-java-client-entity-json</artifactId>
+      <version>4.59.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.github.deutschebank.symphony</groupId>
+      <artifactId>symphony-shared-stream</artifactId>
+      <version>4.59.1-SNAPSHOT</version>
+    </dependency>    
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+      <version>${spring-boot.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-validation</artifactId>
+      <version>${spring-boot.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>2.0.1.Final</version>
+    </dependency>
+
+    <!-- allows chat workflow to send attachments -->
+    <dependency>
+      <groupId>org.glassfish.jersey.media</groupId>
+      <artifactId>jersey-media-multipart</artifactId>
+      <scope>provided</scope>
+      <version>2.28</version>
+    </dependency>
+
+    <!-- for testing -->
+      <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+      <version>${spring-boot.version}</version>
+    </dependency>
+
+  </dependencies>
+
+</project>
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/AbstractNeedsWorkflow.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/AbstractNeedsWorkflow.java
new file mode 100644
index 000000000..e713bd27d
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/AbstractNeedsWorkflow.java
@@ -0,0 +1,12 @@
+package com.github.deutschebank.symphony.workflow;
+
+public abstract class AbstractNeedsWorkflow  {
+
+	protected Workflow wf;
+
+	public AbstractNeedsWorkflow(Workflow wf) {
+		this.wf = wf;
+	}
+	
+	
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/AbstractWorkflow.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/AbstractWorkflow.java
new file mode 100644
index 000000000..a4ecc9fac
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/AbstractWorkflow.java
@@ -0,0 +1,119 @@
+package com.github.deutschebank.symphony.workflow;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.github.deutschebank.symphony.workflow.content.Addressable;
+import com.github.deutschebank.symphony.workflow.content.Room;
+import com.github.deutschebank.symphony.workflow.content.User;
+import com.github.deutschebank.symphony.workflow.history.History;
+import com.github.deutschebank.symphony.workflow.room.Rooms;
+
+/**
+ * Represents workflows which can use the state of the conversation, and knows which rooms it is in.
+ * 
+ * @author Rob Moffat
+ *
+ */
+public abstract class AbstractWorkflow implements Workflow {
+	
+	protected List<History> historyProviders = new ArrayList<History>();;
+	protected List<Rooms> roomsProviders = new ArrayList<>();
+	private String namespace;
+	private List<User> admins;
+	private Rooms rooms;
+	private History history;
+	List<Room> keyRooms;
+
+	public AbstractWorkflow(String namespace, List<User> admins, List<Room> keyRooms) {
+		super();
+		this.history = createHistoryDelegate();
+		this.rooms = createRoomsDelegate();
+		this.keyRooms = keyRooms;
+		this.admins = admins;
+	}
+
+	@Override
+	public String getNamespace() {
+		return namespace;
+	}
+
+	@Override
+	public Rooms getRoomsApi() {
+		return rooms;
+	}
+
+	@Override
+	public History getHistoryApi() {
+		return history;
+	}
+	
+
+	private Rooms createRoomsDelegate() {
+		return new Rooms() {
+			
+			@Override
+			public Set<Room> getAllRooms() {
+				return roomsProviders.stream()
+					.flatMap(rp -> rp.getAllRooms().stream())
+					.collect(Collectors.toSet());
+			}
+			
+			@Override
+			public Room ensureRoom(Room r) {
+				return roomsProviders.stream()
+					.map(rp -> rp.ensureRoom(r))
+					.findFirst()
+					.orElseThrow(() -> new UnsupportedOperationException("Couldn't ensure room "+r));
+			}
+		};
+	}
+
+	private History createHistoryDelegate() {
+		return new History() {
+
+			@Override
+			public <X> Optional<X> getLastFromHistory(Class<X> type, Addressable address) {
+				return historyProviders.stream()
+					.map(hp -> hp.getLastFromHistory(type, address))
+					.filter(Optional::isPresent)
+					.map(Optional::get)
+					.findFirst();
+			}
+
+			@Override
+			public <X> List<X> getFromHistory(Class<X> type, Addressable address, Instant since) {
+				return historyProviders.stream()
+					.flatMap(hp -> hp.getFromHistory(type, address, since).stream())
+					.collect(Collectors.toList());
+			}
+			
+		};
+	} 
+
+	@Override
+	public List<Room> getKeyRooms() {
+		return keyRooms;
+	}
+
+	@Override
+	public List<User> getAdministrators() {
+		return admins;
+	}
+
+	@Override
+	public void registerHistoryProvider(History h) {
+		historyProviders.add(h);
+	}
+
+	@Override
+	public void registerRoomsProvider(Rooms r) {
+		roomsProviders.add(r);
+	}
+
+	
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/Workflow.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/Workflow.java
new file mode 100644
index 000000000..d4ce90283
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/Workflow.java
@@ -0,0 +1,53 @@
+package com.github.deutschebank.symphony.workflow;
+
+import java.util.List;
+import java.util.Map;
+
+import com.github.deutschebank.symphony.workflow.content.Message;
+import com.github.deutschebank.symphony.workflow.content.Room;
+import com.github.deutschebank.symphony.workflow.content.User;
+import com.github.deutschebank.symphony.workflow.form.Button;
+import com.github.deutschebank.symphony.workflow.history.History;
+import com.github.deutschebank.symphony.workflow.response.Response;
+import com.github.deutschebank.symphony.workflow.room.Rooms;
+
+/**
+ * A workflow is a collection of steps, which can be triggered by messages posted in a Symphony room.
+ * 
+ * @author Rob Moffat
+ *
+ */
+public interface Workflow {
+		
+	public String getNamespace();
+	
+	public Map<String, String> getCommands(Room r);
+	
+	public List<Response> applyCommand(User u, Room r, String commandName, Object argument, Message m);
+	
+	List<Button> gatherButtons(Object out, Room r);
+	
+	public Rooms getRoomsApi();
+	
+	public History getHistoryApi();
+	
+	/**
+	 * Important named rooms that must exist for the workflow.  
+	 */
+	public List<Room> getKeyRooms();
+	
+	/**
+	 * List of administrators to be set on any rooms that get created.
+	 */
+	public List<User> getAdministrators();
+	
+	/**
+	 * This is the set of classes that will be sent in the "data" payload of the messages used to communicate workflow.
+	 */
+	public List<Class<?>> getDataTypes();
+
+	public void registerHistoryProvider(History h);
+	
+	public void registerRoomsProvider(Rooms r);
+}
+
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Addressable.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Addressable.java
new file mode 100644
index 000000000..4dc8a490b
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Addressable.java
@@ -0,0 +1,5 @@
+package com.github.deutschebank.symphony.workflow.content;
+
+public interface Addressable {
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Author.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Author.java
new file mode 100644
index 000000000..8af16dbb3
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Author.java
@@ -0,0 +1,13 @@
+package com.github.deutschebank.symphony.workflow.content;
+
+/**
+ * Declare this class in a workflow object, and it will get populated automatically with the 
+ * person submitting the object.
+ */
+public interface Author extends User {
+
+	/**
+	 * Keeps track of who is working on the workflow, so we can get the author details back.
+	 */
+	public static final ThreadLocal<Author> CURRENT_AUTHOR = new ThreadLocal<>();
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Content.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Content.java
new file mode 100644
index 000000000..fecb0db61
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Content.java
@@ -0,0 +1,35 @@
+package com.github.deutschebank.symphony.workflow.content;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public interface Content {
+	
+	@JsonIgnore
+	public String getText();
+
+	public default <X extends Content> List<X> only(Class<X> x) {
+		if (x.isAssignableFrom(this.getClass())) {
+			return Collections.singletonList((X) this);
+		} else if (this instanceof Iterable<?>) {
+			return StreamSupport.stream(((Iterable<Content>) this).spliterator(), false)
+				.flatMap(i -> i.only(x).stream())
+				.collect(Collectors.toList());
+		} else {
+			return Collections.emptyList();
+		}
+	}
+	
+	public default <X extends Content> Optional<X> getNth(Class<X> x, int n) {
+		try {
+			return Optional.of(only(x).get(n));
+		} catch (Exception e) {
+			return Optional.empty();
+		}
+	}
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/ID.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/ID.java
new file mode 100644
index 000000000..b611f6c41
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/ID.java
@@ -0,0 +1,21 @@
+package com.github.deutschebank.symphony.workflow.content;
+
+import java.util.UUID;
+
+/**
+ * This is a special class of tag which is a globally unique ID for the workflow element,
+ * which can be used to track the evolution of a workflow.
+ * 
+ * @author Rob Moffat
+ *
+ */
+public class ID extends TagDef {
+
+	public ID() {
+		this(UUID.randomUUID());
+	}
+
+	public ID(UUID uuid) {
+		super(uuid.toString(), uuid.toString(), Type.HASH);
+	}
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Message.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Message.java
new file mode 100644
index 000000000..27b53ea9a
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Message.java
@@ -0,0 +1,51 @@
+package com.github.deutschebank.symphony.workflow.content;
+
+import java.util.Iterator;
+import java.util.List;
+
+public interface Message extends Content, Iterable<Content> {
+
+	List<Content> getContents();
+	
+	public static Message of(List<Content> c) {
+		return new Message() {
+
+			@Override
+			public List<Content> getContents() {
+				return c;
+			}
+
+			@Override
+			public int hashCode() {
+				return c.hashCode();
+			}
+
+			@Override
+			public boolean equals(Object obj) {
+				if (obj instanceof Message) {
+					return getContents().equals(((Message) obj).getContents());
+				} else {
+					return false;
+				}
+			}
+
+			@Override
+			public String toString() {
+				return "Message ["+c.toString()+"]";
+			}
+
+			@Override
+			public Iterator<Content> iterator() {
+				return c.iterator();
+			}
+
+			@Override
+			public String getText() {
+				return getContents().stream()
+						.map(e -> e.getText())
+						.reduce("", (a, b) -> a + "\n" + b);
+			}
+		};
+	}
+	
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Paragraph.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Paragraph.java
new file mode 100644
index 000000000..c326514e1
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Paragraph.java
@@ -0,0 +1,51 @@
+package com.github.deutschebank.symphony.workflow.content;
+
+import java.util.Iterator;
+import java.util.List;
+
+public interface Paragraph extends Content, Iterable<Content> {
+
+	List<Content> getContents();
+	
+
+	public static Paragraph of(List<Content> c) {
+		return new Paragraph() {
+
+			@Override
+			public List<Content> getContents() {
+				return c;
+			}
+
+			@Override
+			public int hashCode() {
+				return c.hashCode();
+			}
+
+			@Override
+			public boolean equals(Object obj) {
+				if (obj instanceof Paragraph) {
+					return getContents().equals(((Paragraph) obj).getContents());
+				} else {
+					return false;
+				}
+			}
+
+			@Override
+			public String toString() {
+				return "Paragraph ["+c.toString()+"]";
+			}
+
+			@Override
+			public Iterator<Content> iterator() {
+				return c.iterator();
+			}
+
+			@Override
+			public String getText() {
+				return getContents().stream()
+					.map(e -> e.getText())
+					.reduce("", (a, b) -> a + " " + b);
+			}
+		};
+	}
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/PastedTable.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/PastedTable.java
new file mode 100644
index 000000000..166d3ea31
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/PastedTable.java
@@ -0,0 +1,16 @@
+package com.github.deutschebank.symphony.workflow.content;
+
+import java.util.List;
+
+/**
+ * Represents a table pasted into a chat.
+ * 
+ * @author Rob Moffat
+ *
+ */
+public interface PastedTable extends Content {
+
+	public List<Content> getColumnNames();
+	
+	public List<List<Content>> getData();
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Room.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Room.java
new file mode 100644
index 000000000..ecdcbce52
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Room.java
@@ -0,0 +1,20 @@
+package com.github.deutschebank.symphony.workflow.content;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+/**
+ * This defines a Room as a collection of people.   Whenm 
+ * @author Rob Moffat
+ *
+ */
+@JsonDeserialize(as = RoomDef.class)
+public interface Room extends Addressable {
+
+	public String getRoomName();
+	
+	public String getRoomDescription();
+			
+	public boolean isPub();
+	
+	public String getId();
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/RoomDef.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/RoomDef.java
new file mode 100644
index 000000000..871a641a0
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/RoomDef.java
@@ -0,0 +1,71 @@
+package com.github.deutschebank.symphony.workflow.content;
+
+public class RoomDef implements Room {
+
+	protected String roomName;
+	protected String roomDescription;
+	protected boolean pub;
+	protected String id;
+	
+	public RoomDef() {
+	}
+	
+	public RoomDef(String name, String description, boolean pub, String id) {
+		super();
+		this.roomName = name;
+		this.roomDescription = description;
+		this.pub = pub;
+		this.id = id;
+	}
+
+	@Override
+	public String getRoomName() {
+		return roomName;
+	}
+
+	@Override
+	public String getRoomDescription() {
+		return roomDescription;
+	}
+
+	@Override
+	public boolean isPub() {
+		return pub;
+	}
+
+	@Override
+	public String toString() {
+		return "RoomDef [name=" + roomName + ", description=" + roomDescription + ", pub=" + pub + "]";
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((roomName == null) ? 0 : roomName.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		RoomDef other = (RoomDef) obj;
+		if (roomName == null) {
+			if (other.roomName != null)
+				return false;
+		} else if (!roomName.equals(other.roomName))
+			return false;
+		return true;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Tag.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Tag.java
new file mode 100644
index 000000000..b3c918811
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Tag.java
@@ -0,0 +1,30 @@
+package com.github.deutschebank.symphony.workflow.content;
+
+public interface Tag extends Content {
+
+	public enum Type { CASH("$"), HASH("#"), USER("@");
+		
+		Type(String symbol) {
+			this.symbol = symbol;
+		}
+
+		public String getSymbol() {
+			return symbol;
+		}
+		
+		String symbol;
+	}
+	
+	/**
+	 * Underlying system id.
+	 */
+	public String getId();
+	
+	public Type getTagType();
+	
+	/**
+	 * Screen, display name
+	 */
+	public String getName();
+	
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/TagDef.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/TagDef.java
new file mode 100644
index 000000000..187407e06
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/TagDef.java
@@ -0,0 +1,80 @@
+package com.github.deutschebank.symphony.workflow.content;
+
+public class TagDef implements Tag {
+
+	protected String name;
+	protected String id;
+	protected Type tagType;
+
+	public TagDef() {
+	}
+
+	public TagDef(String id, String name, Type t) {
+		super();
+		this.id = id;
+		this.name = name;
+		this.tagType = t;
+	}
+
+	@Override
+	public String getName() {
+		return name;
+	}
+
+
+	@Override
+	public String getId() {
+		return id;
+	}
+	
+	@Override
+	public Type getTagType() {
+		return tagType;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		result = prime * result + ((name == null) ? 0 : name.hashCode());
+		result = prime * result + ((tagType == null) ? 0 : tagType.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		TagDef other = (TagDef) obj;
+		if (id == null) {
+			if (other.id != null)
+				return false;
+		} else if (!id.equals(other.id))
+			return false;
+		if (name == null) {
+			if (other.name != null)
+				return false;
+		} else if (!name.equals(other.name))
+			return false;
+		if (tagType != other.tagType)
+			return false;
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return "TagDef [name=" + name + ", id=" + id + ", type=" + tagType + "]";
+	}
+
+	@Override
+	public String getText() {
+		return tagType.getSymbol()+name;
+	}
+
+	
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/User.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/User.java
new file mode 100644
index 000000000..05dd2933e
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/User.java
@@ -0,0 +1,15 @@
+package com.github.deutschebank.symphony.workflow.content;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+@JsonDeserialize(as = UserDef.class)
+@JsonSerialize()
+public interface User extends Addressable, Tag {
+	
+	/**
+	 * Email address, if known
+	 */
+	public String getAddress();
+	
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/UserDef.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/UserDef.java
new file mode 100644
index 000000000..78ebba41c
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/UserDef.java
@@ -0,0 +1,69 @@
+package com.github.deutschebank.symphony.workflow.content;
+
+public class UserDef extends TagDef implements Author, User {
+	
+	protected String address;
+	
+	public UserDef() {
+		super();
+	}
+
+	public UserDef(String id, String name, String address) {
+		super(id, name, Type.USER);
+		this.address = address;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+	
+	@Override
+	public Type getTagType() {
+		return Type.USER;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((address == null) ? 0 : address.hashCode());
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		result = prime * result + ((name == null) ? 0 : name.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		UserDef other = (UserDef) obj;
+		if (address == null) {
+			if (other.address != null)
+				return false;
+		} else if (!address.equals(other.address))
+			return false;
+		if (id == null) {
+			if (other.id != null)
+				return false;
+		} else if (!id.equals(other.id))
+			return false;
+		if (name == null) {
+			if (other.name != null)
+				return false;
+		} else if (!name.equals(other.name))
+			return false;
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return "UserDef [address=" + address + ", name=" + name + ", id=" + id + "]";
+	}
+
+	
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Word.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Word.java
new file mode 100644
index 000000000..db00409ed
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/content/Word.java
@@ -0,0 +1,42 @@
+package com.github.deutschebank.symphony.workflow.content;
+
+public interface Word extends Content {
+
+	public String getIdentifier();
+	
+	public static Word of(String s) {
+		return new Word() {
+
+			@Override
+			public String getIdentifier() {
+				return s.replaceAll("[^a-zA-Z0-9]", "").toLowerCase();
+			}
+
+			@Override
+			public String getText() {
+				return s;
+			}
+
+			@Override
+			public int hashCode() {
+				return getIdentifier().hashCode();
+			}
+
+			@Override
+			public boolean equals(Object obj) {
+				if (obj instanceof Word) {
+					return this.getIdentifier().equals(((Word) obj).getIdentifier());
+				} else {
+					return false;
+				}
+			}
+
+			@Override
+			public String toString() {
+				return "Word ["+s+"]";
+			}
+			
+			
+		};
+	}
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/form/Button.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/form/Button.java
new file mode 100644
index 000000000..00a79ebd3
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/form/Button.java
@@ -0,0 +1,42 @@
+package com.github.deutschebank.symphony.workflow.form;
+
+public class Button {
+	
+	public enum Type { ACTION, RESET };
+
+	private String name;
+	private Type type;
+	private String text;
+	
+	public Button(String name, Type type, String text) {
+		super();
+		this.name = name;
+		this.type = type;
+		this.text = text;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Type getType() {
+		return type;
+	}
+
+	public void setType(Type type) {
+		this.type = type;
+	}
+
+	public String getText() {
+		return text;
+	}
+
+	public void setText(String text) {
+		this.text = text;
+	}
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/history/History.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/history/History.java
new file mode 100644
index 000000000..f9838c485
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/history/History.java
@@ -0,0 +1,15 @@
+package com.github.deutschebank.symphony.workflow.history;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Optional;
+
+import com.github.deutschebank.symphony.workflow.content.Addressable;
+
+public interface History {
+	
+	public <X> Optional<X> getLastFromHistory(Class<X> type, Addressable address);
+	
+	public <X> List<X> getFromHistory(Class<X> type, Addressable address, Instant since);
+		
+}
\ No newline at end of file
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/java/ClassBasedWorkflow.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/java/ClassBasedWorkflow.java
new file mode 100644
index 000000000..e5eb4e925
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/java/ClassBasedWorkflow.java
@@ -0,0 +1,275 @@
+package com.github.deutschebank.symphony.workflow.java;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Parameter;
+import java.lang.reflect.ParameterizedType;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import com.github.deutschebank.symphony.workflow.AbstractWorkflow;
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.content.Addressable;
+import com.github.deutschebank.symphony.workflow.content.Content;
+import com.github.deutschebank.symphony.workflow.content.Message;
+import com.github.deutschebank.symphony.workflow.content.Paragraph;
+import com.github.deutschebank.symphony.workflow.content.PastedTable;
+import com.github.deutschebank.symphony.workflow.content.Room;
+import com.github.deutschebank.symphony.workflow.content.Tag;
+import com.github.deutschebank.symphony.workflow.content.User;
+import com.github.deutschebank.symphony.workflow.content.Word;
+import com.github.deutschebank.symphony.workflow.form.Button;
+import com.github.deutschebank.symphony.workflow.form.Button.Type;
+import com.github.deutschebank.symphony.workflow.response.ErrorResponse;
+import com.github.deutschebank.symphony.workflow.response.FormResponse;
+import com.github.deutschebank.symphony.workflow.response.Response;
+
+public class ClassBasedWorkflow extends AbstractWorkflow implements ConfigurableWorkflow {
+
+	public static final String WF_EDIT = "wf-edit";
+	private List<Class<?>> workflowClasses = new ArrayList<>();
+	private Map<String, Method> methods = new HashMap<>();
+	
+	public ClassBasedWorkflow(String namespace, List<User> admins, List<Room> keyRooms) {
+		super(namespace, admins, keyRooms); 
+	}
+
+	@Override
+	public Map<String, String> getCommands(Room r) {
+		return methods.entrySet().stream()
+			.filter(e -> validRoom(e.getValue(), r))
+			.collect(Collectors.toMap(e -> e.getKey(), e -> getDescription(e.getValue())));
+	}
+	
+	public void addClass(Class<?> e) {
+		matchingMethods(e, null).stream()
+			.forEach(m -> {
+				if (methods.containsKey(m.getName())) {
+					throw new UnsupportedOperationException("Methods clash: "+m+" with "+methods.get(m.getName()));					
+				} 
+				methods.put(m.getName(), m);
+			});
+		workflowClasses.add(e);
+	}
+	
+	private List<Method> matchingMethods(Class<?> c, Room r) {
+		if ((c == null) || (c == Object.class)) {
+			return Collections.emptyList();
+		}
+		
+		List<Method> out = new ArrayList<>();
+		
+		for (Method m : c.getDeclaredMethods()) {
+			if (m.getAnnotation(Exposed.class) != null) {
+				if (checkParameters(m)) {
+					throw new UnsupportedOperationException("Methods annotated with @Exposed must have 1 or 0 parameters (excluding room, workflow, user etc): "+m.getClass()+"::"+m.getName());
+				}
+				
+				if (validRoom(m, r)) {
+					out.add(m);
+				}
+			}
+		}
+		
+		out.addAll(matchingMethods(c.getSuperclass(), r));
+		return out;
+	}
+	
+	private long countParameters(Method m) {
+		return Arrays.stream(m.getParameters())
+				.filter(p -> !isWorkflowParameter(p))
+				.count();
+	}
+
+	private boolean checkParameters(Method m) {
+		long count = countParameters(m);
+		
+		return count > 1;
+	}
+
+	private boolean isWorkflowParameter(Parameter p) {
+		Class<?> c = p.getType();
+		if (Workflow.class.isAssignableFrom(c)) {
+			return true;
+		} else if (Addressable.class.isAssignableFrom(c)) {
+			return true;
+		}
+		
+		return false;
+	}
+
+	@Override
+	public List<Response> applyCommand(User u, Room r, String commandName, Object argument, Message msg) {
+		Method m = methods.get(commandName);
+		
+		if (m == null) {
+			return null;
+		}
+		
+		if (!validRoom(m, r)) {
+			return Collections.singletonList(new ErrorResponse(this, r, "'"+commandName+"' can't be used in this room"));
+		}
+		
+		Class<?> c = m.getDeclaringClass();
+		Optional<?> o = Optional.empty();
+		if (!Modifier.isStatic(m.getModifiers())) {
+			// load the current object
+			o = getHistoryApi().getLastFromHistory(c, r);
+			
+			if ((!o.isPresent()) || (o.get().getClass() != c)) {
+				return Collections.singletonList(new ErrorResponse(this, r, "Couldn't find work for "+commandName));
+			}
+		}
+			
+		Object[] args = new Object[m.getParameterCount()];
+		Map<Class<?>, Deque<Object>> parameterBuckets = setupParameterBuckets(u, r, msg);
+		
+		for (int i = 0; i < args.length; i++) {
+			Class<?> cl = m.getParameters()[i].getType();
+			if (parameterBuckets.containsKey(cl)) {
+				args[i] = parameterBuckets.get(cl).pop();
+			} else if (argument != null) {
+				args[i] = argument;
+			} else {
+				// missing parameter
+				return  Collections.singletonList(new FormResponse(this, r,  null, "Enter "+getName(cl), getInstructions(cl), cl, true, 
+					Collections.singletonList(new Button(commandName+"+0", Type.ACTION, m.getName()))));
+			}
+		}
+			
+		try {
+			Object out = m.invoke(o.orElse(null), args);
+			Class<?> cc = out.getClass();
+			
+			if (Response.class.isAssignableFrom(cc)) {
+				return  Collections.singletonList((Response) out);
+			} else if (listOfResponses(m)) {
+				return (List<Response>) out;
+			} else {
+				return  Collections.singletonList(new FormResponse(this, r, out, getName(cc), getInstructions(cc), out, false, gatherButtons(out, r)));
+			}
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+			return Collections.singletonList(new ErrorResponse(this, r, e.getCause().getMessage()));
+		}
+	}
+
+	private boolean listOfResponses(Method m) {
+		java.lang.reflect.Type out = m.getGenericReturnType();
+		if (out instanceof ParameterizedType) {
+			if (Collection.class.isAssignableFrom((Class<?>) ((ParameterizedType) out).getRawType())) {
+				if (Response.class.isAssignableFrom((Class<?>) ((ParameterizedType) out).getActualTypeArguments()[0])) {
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+
+	private Map<Class<?>, Deque<Object>> setupParameterBuckets(User u, Room r, Message m) {
+		Map<Class<?>, Deque<Object>> out = new HashMap<>();
+		for (Class<?> class1 : new Class[] { Room.class, User.class, Workflow.class, Message.class, Paragraph.class, PastedTable.class, Word.class, Tag.class}) {
+			Deque<Object> l = new LinkedList<Object>();
+			
+			if (class1 == Workflow.class) {
+				l.add(this);
+			} else if (class1 == User.class) {
+				l.add(u);
+			} else if (class1 == Room.class) {
+				l.add(r);
+			} else if ((class1 == Message.class) && (m!=null)) {
+				l.add(m);
+			}
+			
+			if ((Content.class.isAssignableFrom(class1)) && (m!=null)) {
+				l.addAll(m.only((Class<Content>) class1));
+			}
+			
+			
+			out.put(class1, l);
+		}
+		
+		return out;
+	}
+
+	@Override
+	public List<Button> gatherButtons(Object out, Room r) {
+		List<Button> buttons = new ArrayList<>();
+		if (out.getClass().isAnnotationPresent(Work.class)) {
+			Work w = out.getClass().getAnnotation(Work.class);
+			if (w.editable()) {
+				buttons.add(new Button(WF_EDIT, Type.ACTION, "Edit"));
+			}
+		}
+		
+		List<Method> cms = matchingMethods(out.getClass(), r);
+		if (cms != null) {
+			for (Method method : cms) {
+				if (!Modifier.isStatic(method.getModifiers())) {
+					if(countParameters(method) == 1) {
+						buttons.add(new Button(method.getName()+"+1", Type.ACTION, method.getName()));
+					} else {
+						buttons.add(new Button(method.getName(), Type.ACTION, method.getName()));
+					}
+				}
+			}
+		}
+		
+		return buttons;
+	}
+
+	public static String getName(Class<?> c) {
+		Work w = c.getAnnotation(Work.class);
+		if (w != null) {
+			return w.name();
+		} else {
+			return c.getName();
+		}
+	}
+	
+	public static String getInstructions(Class<?> c) {
+		Work w = c.getAnnotation(Work.class);
+		return w.instructions();
+	}
+	
+	public static String getDescription(Method m) {
+		Exposed e = m.getAnnotation(Exposed.class);
+		return e.description();
+	}
+	
+	public static boolean validRoom(Method value, Room r) {
+		if (r == null) {
+			return true;
+		} else {
+			Exposed e = value.getAnnotation(Exposed.class);
+			if (e.rooms().length == 0) {
+				return true;
+			} else {
+				for (int i = 0; i < e.rooms().length; i++) {
+					if (e.rooms()[i].equals(r.getRoomName())) {
+						return true;
+					}
+				}
+			}
+			
+			return false;
+		}
+	}
+
+	@Override
+	public List<Class<?>> getDataTypes() {
+		return workflowClasses;
+	}
+	
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/java/ConfigurableWorkflow.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/java/ConfigurableWorkflow.java
new file mode 100644
index 000000000..da1168ccd
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/java/ConfigurableWorkflow.java
@@ -0,0 +1,8 @@
+package com.github.deutschebank.symphony.workflow.java;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+
+public interface ConfigurableWorkflow extends Workflow{
+	
+	public void addClass(Class<?> c);
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/java/Exposed.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/java/Exposed.java
new file mode 100644
index 000000000..416919f77
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/java/Exposed.java
@@ -0,0 +1,17 @@
+package com.github.deutschebank.symphony.workflow.java;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Exposed {
+
+	String description() default "";
+	
+	String[] rooms() default {};
+	
+	/**
+	 * Use this with a pasted table command
+	 */
+	String[] columns() default {};
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/java/Work.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/java/Work.java
new file mode 100644
index 000000000..3da89696b
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/java/Work.java
@@ -0,0 +1,22 @@
+package com.github.deutschebank.symphony.workflow.java;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Indicates that we should provide edit functionality for this object when it is in a chat
+ * 
+ * @author Rob Moffat
+ *
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Work {
+
+	public String name() default "";
+	
+	public String instructions() default "";
+	
+	public boolean editable() default false;
+	
+	public String[] rooms() default {};
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/AttachmentResponse.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/AttachmentResponse.java
new file mode 100644
index 000000000..2bf7ec901
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/AttachmentResponse.java
@@ -0,0 +1,28 @@
+package com.github.deutschebank.symphony.workflow.response;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.content.Addressable;
+
+public class AttachmentResponse extends DataResponse {
+	
+	private final byte[] attachment;
+	private final String suffix;
+	
+
+	public AttachmentResponse(Workflow wf, Addressable stream, String name, String instructions, byte[] attachment, String suffix) {
+		super(wf, stream, null, name, instructions);
+		this.attachment = attachment;
+		this.suffix = suffix;
+	}
+
+	public byte[] getAttachment() {
+		return attachment;
+	}
+
+	public String getSuffix() {
+		return suffix;
+	}
+
+	
+	
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/DataResponse.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/DataResponse.java
new file mode 100644
index 000000000..88a16878b
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/DataResponse.java
@@ -0,0 +1,48 @@
+package com.github.deutschebank.symphony.workflow.response;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.content.Addressable;
+
+public class DataResponse implements Response {
+
+	private final Object data;
+	private final Addressable stream;
+	private final Workflow workflow;
+	private final String name;
+	private final String instructions;
+
+	public DataResponse(Workflow wf, Addressable stream, Object data, String name, String instructions) {
+		super();
+		this.data = data;
+		this.stream = stream;
+		this.workflow = wf;
+		this.name = name;
+		this.instructions = instructions;
+	}
+
+	public Object getData() {
+		return data;
+	}
+	
+	public Addressable getAddress() {
+		return stream;
+	}
+
+	public Workflow getWorkflow() {
+		return workflow;
+	}
+
+	@Override
+	public String toString() {
+		return "DataResponse [data=" + data + ", stream=" + stream + ", workflow=" + workflow + "]";
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public String getInstructions() {
+		return instructions;
+	}
+	
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/ErrorResponse.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/ErrorResponse.java
new file mode 100644
index 000000000..def7b4ccf
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/ErrorResponse.java
@@ -0,0 +1,20 @@
+package com.github.deutschebank.symphony.workflow.response;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.content.Addressable;
+
+public class ErrorResponse extends MessageResponse {
+
+	public ErrorResponse(Workflow wf, Addressable stream, String messageML) {
+		super(wf, stream, null, "Error", "Please Investigate", messageML);
+	}
+
+	@Override
+	public String toString() {
+		return "ErrorResponse [getMessage()=" + getMessage() + ", getData()=" + getData() + ", getAddress()="
+				+ getAddress() + ", getWorkflow()=" + getWorkflow() + "]";
+	}
+
+	
+	
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/FormResponse.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/FormResponse.java
new file mode 100644
index 000000000..2bf98e53b
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/FormResponse.java
@@ -0,0 +1,69 @@
+package com.github.deutschebank.symphony.workflow.response;
+
+import java.util.List;
+
+import org.springframework.validation.Errors;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.content.Addressable;
+import com.github.deutschebank.symphony.workflow.form.Button;
+import com.github.deutschebank.symphony.workflow.validation.ErrorHelp;
+
+public class FormResponse extends DataResponse {
+
+	private final boolean editable;
+	private final Object formObject;
+	private final Class<?> formClass;
+	private final List<Button> buttons;
+	private final Errors errors;
+		
+	public FormResponse(Workflow wf, Addressable stream, Object data, String name, String instructions, Object formObject, boolean editable, List<Button> buttons, Errors e) {
+		super(wf, stream, data, name, instructions);
+		this.editable = editable;
+		this.formObject = formObject;
+		this.buttons = buttons;
+		this.formClass = formObject.getClass();
+		this.errors = e;
+	}
+
+	public FormResponse(Workflow wf, Addressable stream, Object data, String name, String instructions, Object formObject, boolean editable, List<Button> buttons) {
+		this(wf, stream, data, name, instructions, formObject, editable, buttons, ErrorHelp.createErrorHolder());
+	}
+	
+	public FormResponse(Workflow wf, Addressable stream, Object data, String name, String instructions, Class<?> formClass, boolean editable, List<Button> buttons) {
+		super(wf, stream, data, name, instructions);
+		this.editable = editable;
+		this.formObject = null;
+		this.buttons = buttons;
+		this.formClass = formClass;
+		this.errors = ErrorHelp.createErrorHolder();
+	}
+
+	public boolean isEditable() {
+		return editable;
+	}
+
+	public Object getFormObject() {
+		return formObject;
+	}
+
+	public List<Button> getButtons() {
+		return buttons;
+	}
+	
+	public Class<?> getFormClass() {
+		return formClass;
+	}
+
+	public Errors getErrors() {
+		return errors;
+	}
+
+	@Override
+	public String toString() {
+		return "FormResponse [editable=" + editable + ", formObject=" + formObject + ", formClass=" + formClass
+				+ ", buttons=" + buttons + ", errors=" + errors + "]";
+	}
+
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/MessageResponse.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/MessageResponse.java
new file mode 100644
index 000000000..f72b40c00
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/MessageResponse.java
@@ -0,0 +1,26 @@
+package com.github.deutschebank.symphony.workflow.response;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.content.Addressable;
+
+public class MessageResponse extends DataResponse {
+	
+	private final String message;
+
+	public MessageResponse(Workflow wf, Addressable stream, Object data, String name, String instructions, String message) {
+		super(wf, stream, data, name, instructions);
+		this.message = message;
+	}
+	
+	public String getMessage() {
+		return message;
+	}
+
+	@Override
+	public String toString() {
+		return "MessageResponse [message=" + message + ", getData()=" + getData() + ", getAddress()=" + getAddress()
+				+ ", getWorkflow()=" + getWorkflow() + "]";
+	}
+	
+	
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/Response.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/Response.java
new file mode 100644
index 000000000..4e5546a89
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/response/Response.java
@@ -0,0 +1,19 @@
+package com.github.deutschebank.symphony.workflow.response;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.content.Addressable;
+
+public interface Response {
+
+	/**
+	 * Details where the response is supposed to be sent. 
+	 */
+	public Addressable getAddress(); 
+	
+	public Workflow getWorkflow();
+	
+	public String getName();
+	
+	public String getInstructions();
+	
+}
\ No newline at end of file
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/room/Rooms.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/room/Rooms.java
new file mode 100644
index 000000000..f695c04a7
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/room/Rooms.java
@@ -0,0 +1,16 @@
+package com.github.deutschebank.symphony.workflow.room;
+
+import java.util.Set;
+
+import com.github.deutschebank.symphony.workflow.content.Room;
+
+public interface Rooms {
+
+	/**
+	 * Returns all the rooms that the bot is a member of.
+	 */
+	public Set<Room> getAllRooms();
+	
+	public Room ensureRoom(Room r);
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/Action.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/Action.java
new file mode 100644
index 000000000..378e5dc91
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/Action.java
@@ -0,0 +1,11 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony;
+
+import com.github.deutschebank.symphony.workflow.content.Room;
+import com.github.deutschebank.symphony.workflow.content.User;
+
+public interface Action {
+
+	public Room getRoom();
+	
+	public User getUser();
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/SymphonyBot.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/SymphonyBot.java
new file mode 100644
index 000000000..24c5f47bc
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/SymphonyBot.java
@@ -0,0 +1,49 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import com.github.deutschebank.symphony.stream.StreamEventConsumer;
+import com.symphony.api.id.SymphonyIdentity;
+import com.symphony.api.model.V4Event;
+
+/**
+ * Handles workflow events originating on symphony.  Simply passes all events on to dedicated
+ * event handlers.
+ * 
+ * @author Rob Moffat
+ *
+ */
+public class SymphonyBot implements StreamEventConsumer {
+
+	private static final Logger LOG = LoggerFactory.getLogger(SymphonyBot.class);
+
+	SymphonyIdentity botIdentity;
+	List<SymphonyEventHandler> eventHandlers;
+	
+	public SymphonyBot(SymphonyIdentity botIdentity, List<SymphonyEventHandler> eventHandlers) {
+		super();
+		this.botIdentity = botIdentity;
+		this.eventHandlers = eventHandlers;
+	}
+
+	public void accept(V4Event event) {
+		try {
+			LOG.info("Beginning handle for "+event);
+			for (SymphonyEventHandler symphonyEventHandler : eventHandlers) {
+				symphonyEventHandler.accept(event);
+			}
+		} catch (Throwable e) {
+			LOG.error("Couldn't handle symphony event: ", e);
+		}
+	}
+
+	@Scheduled(fixedRate=10000)
+	public void doSomething() {
+		
+	}
+	
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/SymphonyEventHandler.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/SymphonyEventHandler.java
new file mode 100644
index 000000000..6ca53bd46
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/SymphonyEventHandler.java
@@ -0,0 +1,9 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony;
+
+import java.util.function.Consumer;
+
+import com.symphony.api.model.V4Event;
+
+public interface SymphonyEventHandler extends Consumer<V4Event> {
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/SymphonyWorkflowComponentsConfig.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/SymphonyWorkflowComponentsConfig.java
new file mode 100644
index 000000000..af2d1ba6f
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/SymphonyWorkflowComponentsConfig.java
@@ -0,0 +1,54 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.AbstractElementsConsumer;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.MethodCallElementsConsumer;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.edit.EditActionElementsConsumer;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.edit.TableAddRow;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.edit.TableDeleteRows;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.edit.TableEditRow;
+import com.github.deutschebank.symphony.workflow.sources.symphony.messages.HelpMessageConsumer;
+import com.github.deutschebank.symphony.workflow.sources.symphony.messages.MethodCallMessageConsumer;
+
+@Configuration
+public class SymphonyWorkflowComponentsConfig {
+	
+	
+	@Bean
+	public HelpMessageConsumer helpConsumer() {
+		return new HelpMessageConsumer();
+	}
+	
+	@Bean
+	public MethodCallMessageConsumer mcConsumer() {
+		return new MethodCallMessageConsumer();
+	}
+	
+	@Bean
+	public AbstractElementsConsumer elementsMethodCallConsumer() {
+		return new MethodCallElementsConsumer();
+	}
+
+	@Bean
+	public EditActionElementsConsumer editActionElementsConsumer() {
+		return new EditActionElementsConsumer();
+	}
+	
+	@Bean
+	public TableAddRow tableAddRow() {
+		return new TableAddRow();
+	}
+	
+	@Bean
+	public TableDeleteRows tableDeleteRows() {
+		return new TableDeleteRows();
+	}
+	
+	@Bean
+	public TableEditRow tableEditRow() {
+		return new TableEditRow();
+	}
+	
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/SymphonyWorkflowConfig.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/SymphonyWorkflowConfig.java
new file mode 100644
index 000000000..a0b366cfc
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/SymphonyWorkflowConfig.java
@@ -0,0 +1,108 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.validation.Validator;
+
+import com.github.deutschebank.symphony.spring.api.SymphonyApiConfig;
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.history.History;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.ElementsConsumer;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.ElementsHandler;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.FormConverter;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.AttachmentHandler;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.EntityJsonConverter;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.FormMessageMLConverter;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.SymphonyResponseHandler;
+import com.github.deutschebank.symphony.workflow.sources.symphony.history.MessageHistory;
+import com.github.deutschebank.symphony.workflow.sources.symphony.messages.PresentationMLHandler;
+import com.github.deutschebank.symphony.workflow.sources.symphony.messages.SimpleMessageConsumer;
+import com.github.deutschebank.symphony.workflow.sources.symphony.messages.SimpleMessageParser;
+import com.github.deutschebank.symphony.workflow.sources.symphony.room.SymphonyRooms;
+import com.github.deutschebank.symphony.workflow.sources.symphony.room.SymphonyRoomsImpl;
+import com.symphony.api.agent.DatafeedApi;
+import com.symphony.api.agent.MessagesApi;
+import com.symphony.api.id.SymphonyIdentity;
+import com.symphony.api.pod.RoomMembershipApi;
+import com.symphony.api.pod.StreamsApi;
+import com.symphony.api.pod.UsersApi;
+
+@Configuration
+public class SymphonyWorkflowConfig {
+	
+	@Autowired
+	@Qualifier(SymphonyApiConfig.BOT_IDENTITY)
+	SymphonyIdentity botIdentity;
+	
+	@Autowired
+	UsersApi usersApi;
+	
+	@Autowired
+	MessagesApi messagesApi; 
+	
+	@Autowired
+	RoomMembershipApi roomMembershipApi;
+	
+	@Autowired
+	StreamsApi streamsApi;
+
+	@Autowired
+	Workflow wf;
+	
+	@Autowired
+	Validator validator;
+	
+	@Autowired
+	AttachmentHandler attachmentHandler;
+	
+	@Bean
+	public SimpleMessageParser simpleMessageParser() {
+		return new SimpleMessageParser();
+	}
+	
+	@Bean
+	public SymphonyResponseHandler symphonyResponseHandler() {
+		return new SymphonyResponseHandler(messagesApi, formMessageMLConverter(), entityJsonConverter(), symphonyRooms(), attachmentHandler);
+	}
+	
+	@Bean
+	public FormMessageMLConverter formMessageMLConverter() {
+		return new FormMessageMLConverter(symphonyRooms());
+	}
+	
+	@Bean
+	public History symphonyHistory() {
+		return new MessageHistory(wf, entityJsonConverter(), messagesApi, symphonyRooms());
+	}
+	
+	@Bean
+	public SymphonyBot symphonyBot(List<SymphonyEventHandler> eventHandlers) {
+		return new SymphonyBot(botIdentity, eventHandlers);
+	}
+	
+	@Bean 
+	public SymphonyRooms symphonyRooms() {
+		SymphonyRooms ru = new SymphonyRoomsImpl(wf, roomMembershipApi, streamsApi, usersApi);
+		return ru;
+	}
+	
+	@Bean
+	public EntityJsonConverter entityJsonConverter() {
+		return new EntityJsonConverter(wf);
+	}
+	
+	@Bean
+	public PresentationMLHandler presentationMLHandler(List<SimpleMessageConsumer> messageConsumers) {
+		return new PresentationMLHandler(wf, botIdentity, usersApi, simpleMessageParser(), entityJsonConverter(), messageConsumers, symphonyResponseHandler(), symphonyRooms());
+	}
+	
+	@Bean
+	public ElementsHandler elementsHandler(List<ElementsConsumer> elementsConsumers) {
+		return new ElementsHandler(wf, messagesApi, entityJsonConverter(), new FormConverter(symphonyRooms()), elementsConsumers, symphonyResponseHandler(), symphonyRooms(), validator);
+	}
+	
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/TagSupport.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/TagSupport.java
new file mode 100644
index 000000000..c098fb1fb
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/TagSupport.java
@@ -0,0 +1,103 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.util.StringUtils;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.content.Tag;
+
+public class TagSupport {
+
+	public static String toHashTag(String in) {
+		if (StringUtils.isEmpty(in)) {
+			return "";
+		}
+		
+		return "<hash tag=\""+formatTag(in)+"\" /> ";
+	}
+	
+	public static String toCashTag(String in) {
+		if (StringUtils.isEmpty(in)) {
+			return "";
+		}
+		
+		return "<cash tag=\""+formatTag(in)+"\" /> ";
+	}
+	
+	public static String toUserTag(String id) {
+		if (StringUtils.isEmpty(id)) {
+			return "";
+		}
+		
+		return "<mention uid=\"" + id + "\" />";
+	}
+	
+	public static String format(Tag t) {
+		if (t == null) {
+			return "";
+		}
+		switch(t.getTagType()) {
+		case CASH:
+			return toCashTag(t.getName());
+		case HASH:
+			return toHashTag(t.getName());
+		case USER:
+			return toUserTag(t.getId());
+		default:
+			return "";
+		}
+	}
+	
+	public static Set<String> classHashTags(Object in) {
+		if (in != null) {
+			return toHashTags(in.getClass());
+		} else {
+			return Collections.emptySet();
+		}
+	}
+
+	
+	
+	private static String formatTag(String in) {
+		return in.replace(".", "-").toLowerCase();
+	}
+	
+	public static String toHashTag(Class<?> in) {
+		if (in == null) {
+			return "";
+		}
+		
+		return toHashTag(in.getCanonicalName());
+	}
+	
+	public static Set<String> toHashTags(Class<?> c) {
+		if ((c == Object.class) || (c == null)) {
+			return Collections.emptySet();
+		} else {
+			Set<String> out = new HashSet<>();
+			out.add(toHashTag(c));
+			for (Class<?> i : c.getInterfaces()) {
+				out.add(toHashTag(i));
+			}
+			
+			out.addAll(toHashTags(c.getSuperclass()));
+			return out;
+		}
+		
+	}
+	
+	public static String formatTag(Class<?> in) {
+		return formatTag(in.getCanonicalName());
+	}
+	
+	public static String toHashTag(Workflow wf) {
+		if (wf == null) {
+			return "";
+		}
+		return toHashTag(wf.getNamespace());
+	}
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/AbstractElementsConsumer.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/AbstractElementsConsumer.java
new file mode 100644
index 000000000..193d17f21
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/AbstractElementsConsumer.java
@@ -0,0 +1,5 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.elements;
+
+public abstract class AbstractElementsConsumer implements ElementsConsumer {
+
+}
\ No newline at end of file
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/ElementsAction.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/ElementsAction.java
new file mode 100644
index 000000000..63260806d
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/ElementsAction.java
@@ -0,0 +1,104 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.elements;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.content.Room;
+import com.github.deutschebank.symphony.workflow.content.User;
+import com.github.deutschebank.symphony.workflow.sources.symphony.Action;
+import com.symphony.api.model.V4SymphonyElementsAction;
+
+/**
+ * Contains all the details extracted from the {@link V4SymphonyElementsAction}, and it's originating message.
+ * 
+ * @author Rob Moffat
+ *
+ */
+public class ElementsAction implements Action {
+
+	private final Workflow workflow;
+	private final Object formData;
+	private final String action;
+	private final Object workflowObject;
+	private final Room r;
+	private final User u;
+	
+	public ElementsAction(Workflow w, Room r, User u, Object formData, String action, Object workflowObject) {
+		super();
+		this.workflow = w;
+		this.formData = formData;
+		this.action = action;
+		this.workflowObject = workflowObject;
+		this.r = r;
+		this.u = u;
+	}
+
+	public Object getFormData() {
+		return formData;
+	}
+
+	public String getAction() {
+		return action;
+	}
+
+	public Object getWorkflowObject() {
+		return workflowObject;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((action == null) ? 0 : action.hashCode());
+		result = prime * result + ((formData == null) ? 0 : formData.hashCode());
+		result = prime * result + ((workflowObject == null) ? 0 : workflowObject.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ElementsAction other = (ElementsAction) obj;
+		if (action == null) {
+			if (other.action != null)
+				return false;
+		} else if (!action.equals(other.action))
+			return false;
+		if (formData == null) {
+			if (other.formData != null)
+				return false;
+		} else if (!formData.equals(other.formData))
+			return false;
+		if (workflowObject == null) {
+			if (other.workflowObject != null)
+				return false;
+		} else if (!workflowObject.equals(other.workflowObject))
+			return false;
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return "ElementsAction [formData=" + formData + ", action=" + action
+				+ ", workflowObject=" + workflowObject + "]";
+	}
+
+	@Override
+	public Room getRoom() {
+		return r;
+	}
+
+	@Override
+	public User getUser() {
+		return u;
+	}
+
+	public Workflow getWorkflow() {
+		return workflow;
+	}
+	
+	
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/ElementsConsumer.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/ElementsConsumer.java
new file mode 100644
index 000000000..a80ef65d9
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/ElementsConsumer.java
@@ -0,0 +1,16 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.elements;
+
+import java.util.List;
+import java.util.function.Function;
+
+import com.github.deutschebank.symphony.workflow.response.Response;
+
+/**
+ * Deals with symphony elements, to start workflows etc.  
+ * First argument is the stream, second is the converted contents of the elements action.
+ * @author Rob Moffat
+ *
+ */
+public interface ElementsConsumer extends Function<ElementsAction, List<Response>> {
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/ElementsHandler.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/ElementsHandler.java
new file mode 100644
index 000000000..bbaea2e83
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/ElementsHandler.java
@@ -0,0 +1,117 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.elements;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.validation.Errors;
+import org.springframework.validation.Validator;
+
+import com.github.deutschebank.symphony.workflow.AbstractNeedsWorkflow;
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.content.Author;
+import com.github.deutschebank.symphony.workflow.content.Room;
+import com.github.deutschebank.symphony.workflow.content.User;
+import com.github.deutschebank.symphony.workflow.form.Button;
+import com.github.deutschebank.symphony.workflow.response.FormResponse;
+import com.github.deutschebank.symphony.workflow.response.Response;
+import com.github.deutschebank.symphony.workflow.sources.symphony.SymphonyEventHandler;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.FormConverter.UnconvertedContent;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.EntityJsonConverter;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.ResponseHandler;
+import com.github.deutschebank.symphony.workflow.sources.symphony.messages.PresentationMLHandler;
+import com.github.deutschebank.symphony.workflow.sources.symphony.room.SymphonyRooms;
+import com.github.deutschebank.symphony.workflow.validation.ErrorHelp;
+import com.symphony.api.agent.MessagesApi;
+import com.symphony.api.model.V4Event;
+import com.symphony.api.model.V4Message;
+import com.symphony.api.model.V4SymphonyElementsAction;
+
+/**
+ * Takes an elements event and turns it into a workflow request.
+ * 
+ * @author Rob Moffat
+ *
+ */
+public class ElementsHandler extends AbstractNeedsWorkflow implements SymphonyEventHandler {
+
+	private static final Logger LOG = LoggerFactory.getLogger(PresentationMLHandler.class);
+	
+	MessagesApi messagesApi;
+	EntityJsonConverter jsonConverter;
+	FormConverter formConverter;
+	List<ElementsConsumer> elementsConsumers;
+	ResponseHandler rh;
+	SymphonyRooms ruBuilder;
+	Validator v;
+	
+	public ElementsHandler(Workflow wf, MessagesApi messagesApi, EntityJsonConverter jsonConverter,
+			FormConverter formConverter, List<ElementsConsumer> elementsConsumers, ResponseHandler rh, SymphonyRooms ruBuilder, Validator v) {
+		super(wf);
+		this.messagesApi = messagesApi;
+		this.jsonConverter = jsonConverter;
+		this.formConverter = formConverter;
+		this.elementsConsumers = elementsConsumers;
+		this.rh = rh;
+		this.ruBuilder = ruBuilder;
+		this.v = v;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void accept(V4Event t) {
+		try {
+			V4SymphonyElementsAction action = t.getPayload().getSymphonyElementsAction();
+			if (action != null) {
+				String verb = (String) ((Map<String, String>) action.getFormValues()).get("action");
+				String formId = action.getFormId();
+				Object currentForm = formConverter.convert((Map<String, Object>) action.getFormValues(), formId);
+				Object data = retrieveData(action.getFormMessageId());
+				Room rr = ruBuilder.loadRoomById(action.getStream().getStreamId());
+				User u = ruBuilder.loadUserById(t.getInitiator().getUser().getUserId());
+				Author.CURRENT_AUTHOR.set((Author) u);
+				Errors e = ErrorHelp.createErrorHolder();
+				
+				if (validated(currentForm, e)) {
+					ElementsAction ea = new ElementsAction(wf, rr, u, currentForm, verb, data);
+					for (ElementsConsumer c : elementsConsumers) {
+						try {
+							List<Response> ra = c.apply(ea);
+							if (ra != null) {
+								ra.stream()
+								.forEach(r -> rh.accept(r));	
+							}
+							
+						} catch (Exception ee) {
+							LOG.error("Failed to handle consumer "+c, ee);
+						}
+					}
+				} else {
+					FormResponse fr = new FormResponse(wf, rr, data, "Error In Form", "Please Fix the validation errors below", currentForm, true, 
+						Collections.singletonList(new Button(verb, Button.Type.ACTION, "Retry")), e);
+					rh.accept(fr);
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Couldn't handle event "+t, e);
+		}
+	}
+
+	private boolean validated(Object currentForm, Errors e) {
+		if ((currentForm != null) && (!(currentForm instanceof UnconvertedContent))) {
+			v.validate(currentForm, e);
+			return !e.hasErrors();
+		} else {
+			return true;
+		}
+	}
+
+	private Object retrieveData(String formMessageId) {
+		V4Message originatingMessage = messagesApi.v1MessageIdGet(null, null, formMessageId.replace("/", "_").replace("+", "-").replace("=", ""));
+		return jsonConverter.readWorkflowValue(originatingMessage.getData());
+	}
+
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/FormConverter.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/FormConverter.java
new file mode 100644
index 000000000..cf8536d59
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/FormConverter.java
@@ -0,0 +1,140 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.elements;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.deutschebank.symphony.workflow.sources.symphony.room.SymphonyRooms;
+
+/**
+ * Converts a form into an object.
+ * 
+ * 
+ * @author Rob Moffat
+ *
+ */
+public class FormConverter {
+	
+	private static Logger LOG = LoggerFactory.getLogger(FormConverter.class);
+	
+	public static class UnconvertedContent {
+		
+		public final Class<?> expected;
+		public final Object structure;
+		
+		public UnconvertedContent(Class<?> expected, Object structure) {
+			super();
+			this.expected = expected;
+			this.structure = structure;
+		}
+	}
+
+
+	private ObjectMapper om = new ObjectMapper();
+	
+	
+	
+	public FormConverter(SymphonyRooms r) {
+		super();
+		
+		om.registerModule(new WorkflowModule(r));
+	}
+
+	/**
+	 * Takes the flat form response and restructures it into a map/list json-style format.
+	 */
+	public Object convert(Map<String, Object> formValues, String type) throws ClassNotFoundException {
+		Object out = new HashMap<>();
+		for (String key : formValues.keySet()) {
+			if (!key.equals("action")) {
+				Object object = formValues.get(key);
+				if (key.endsWith(".")) {
+					key = key.substring(0,key.length()-1);
+				}
+				String[] parts = key.split("\\.");
+				out = placeInStructure(out, parts, 0, object, key);
+			}
+		}
+		
+		// attempt to cast the result.  
+		Class<?> c = null;
+		try {
+			c = Class.forName(type);
+		} catch (Exception e1) {
+			LOG.debug("Couldn't convert {} ",formValues, e1);
+		}
+		try {
+			System.out.println(om.writeValueAsString(out));
+			return om.convertValue(out, c);
+		} catch (Exception e) {
+			LOG.debug("Couldn't convert {} ",formValues, e);
+		}
+		
+		return new UnconvertedContent(c, out);
+	}
+
+	private Object placeInStructure(Object ctx, String[] parts, int p, Object object, String originalKey) {
+		if (p >= parts.length) {
+			return object;
+		} else {
+			String part = parts[p];
+			part = part.startsWith("[") ? part.substring(1, part.length()-1) : part;
+			Integer idx = safeParseInt(part);
+			if (idx != null) {
+				// array
+				List<Object> l = ensureArray(ctx, idx, originalKey);
+				l.set(idx, placeInStructure(l.get(idx), parts, p+1, object, originalKey));
+				return l;
+			} else {
+				Map<String, Object> m = ensureMap(ctx, originalKey);
+				m.put(part, placeInStructure(m.get(part), parts, p+1, object, originalKey));
+				return m;
+			}
+		}
+	}
+
+	private Integer safeParseInt(String part) {
+		try {
+			Integer i = Integer.parseInt(part);
+			return i;
+		} catch (NumberFormatException e) {
+			return null;
+
+		}
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	private List<Object> ensureArray(Object ctx, int index, String originalKey) {
+		if (ctx == null) {
+			ctx = new ArrayList<>(index+1);
+		}
+		if (ctx instanceof ArrayList) {
+			while (((List)ctx).size() <= index) {
+				((List)ctx).add(null);
+			}
+			return (List<Object>) ctx;
+		} else  {
+			throw new UnsupportedOperationException("Clash in "+ctx+" which should be array, "+originalKey);
+		}
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	private Map<String, Object> ensureMap(Object ctx, String originalKey) {
+		if (ctx == null) {
+			ctx = new LinkedHashMap<>();
+		}
+		if (ctx instanceof Map) {
+			return (Map<String, Object>) ctx;
+		} else  {
+			throw new UnsupportedOperationException("Clash in "+ctx+" which should be map, "+originalKey);
+		}
+	}
+
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/MethodCallElementsConsumer.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/MethodCallElementsConsumer.java
new file mode 100644
index 000000000..7d35e6fb9
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/MethodCallElementsConsumer.java
@@ -0,0 +1,32 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.elements;
+
+import java.util.List;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.response.Response;
+
+public class MethodCallElementsConsumer extends AbstractElementsConsumer implements ElementsConsumer {
+
+	
+	@Override
+	public List<Response> apply(ElementsAction u) {
+		String verb = u.getAction();
+		Workflow wf = u.getWorkflow();
+		
+		if (verb.endsWith("+0")) {
+			// argument provided
+			verb = verb.substring(0, verb.length()-2);
+			return wf.applyCommand(u.getUser(), u.getRoom(), verb, u.getFormData(), null);
+		} else if (verb.endsWith("+1")) {
+			// needsArgument
+			verb = verb.substring(0, verb.length()-2);
+			return wf.applyCommand(u.getUser(), u.getRoom(), verb, null, null);
+		} else if (wf.getCommands(u.getRoom()).containsKey(verb)) {
+			// no argument needed
+			return wf.applyCommand(u.getUser(), u.getRoom(), verb, null, null);
+		}
+		
+		return null;
+	}
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/WorkflowModule.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/WorkflowModule.java
new file mode 100644
index 000000000..162d948a1
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/WorkflowModule.java
@@ -0,0 +1,92 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.elements;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.TreeNode;
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.BeanDescription;
+import com.fasterxml.jackson.databind.DeserializationConfig;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.Module;
+import com.fasterxml.jackson.databind.deser.Deserializers;
+import com.fasterxml.jackson.databind.node.LongNode;
+import com.github.deutschebank.symphony.workflow.content.Room;
+import com.github.deutschebank.symphony.workflow.content.User;
+import com.github.deutschebank.symphony.workflow.sources.symphony.room.SymphonyRooms;
+
+/**
+ * Handles conversion of symphony elements' user picker back to User objects.
+ * @author Rob Moffat
+ *
+ */
+public class WorkflowModule extends Module {
+
+	private static final String NAME = "Symphony Workflow Module";
+	private static final Version VERSION = new Version(1, 0, 0, "", "com.db.symphony", "workflow-module");
+
+
+	@Override
+	public String getModuleName() {
+		return NAME;
+	}
+
+	@Override
+	public Version version() {
+		return VERSION;
+	}
+	
+	private SymphonyRooms rooms;
+	
+	public WorkflowModule(SymphonyRooms rooms) {
+		super();
+		this.rooms = rooms;
+	}
+
+	@Override
+	public void setupModule(SetupContext context) {
+		context.addDeserializers(new Deserializers.Base() {
+
+			@Override
+			public JsonDeserializer<?> findBeanDeserializer(JavaType type, DeserializationConfig config,
+					BeanDescription beanDesc) throws JsonMappingException {
+				
+				if (User.class.isAssignableFrom(type.getRawClass())) {
+					return new JsonDeserializer<User>() {
+
+						@Override
+						public User deserialize(JsonParser p, DeserializationContext ctxt)
+								throws IOException, JsonProcessingException {
+							
+							TreeNode tn = p.readValueAsTree();
+							if (tn.size() > 0) {
+								long ul = ((LongNode) tn.get(0)).asLong();
+								return rooms.loadUserById(ul);
+							} else {
+								return null;
+							}
+							
+						}
+					};
+				} else if (Room.class.isAssignableFrom(type.getRawClass())) {
+					return new JsonDeserializer<Room>() {
+
+						@Override
+						public Room deserialize(JsonParser p, DeserializationContext ctxt)
+								throws IOException, JsonProcessingException {
+							return rooms.loadRoomById(p.getValueAsString());
+						}
+					};
+					
+				} else {
+					return null;
+				}
+			}
+		});
+	}
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/edit/EditActionElementsConsumer.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/edit/EditActionElementsConsumer.java
new file mode 100644
index 000000000..dfe162f51
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/edit/EditActionElementsConsumer.java
@@ -0,0 +1,29 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.elements.edit;
+
+import java.util.Collections;
+import java.util.List;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.java.ClassBasedWorkflow;
+import com.github.deutschebank.symphony.workflow.response.FormResponse;
+import com.github.deutschebank.symphony.workflow.response.Response;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.AbstractElementsConsumer;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.ElementsAction;
+
+public class EditActionElementsConsumer extends AbstractElementsConsumer {
+
+	
+	@Override
+	public List<Response> apply(ElementsAction u) {
+		Workflow wf = u.getWorkflow();
+		if (u.getAction().equals(ClassBasedWorkflow.WF_EDIT)) {
+			
+			Object ob = u.getWorkflowObject();
+			return Collections.singletonList(new FormResponse(wf, u.getRoom(), ob, "Edit "+ClassBasedWorkflow.getName(ob.getClass()), ClassBasedWorkflow.getInstructions(ob.getClass()), u.getWorkflowObject(), true, 
+				Collections.emptyList()));
+		}
+		
+		return null;
+	}
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/edit/TableAddRow.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/edit/TableAddRow.java
new file mode 100644
index 000000000..0fba01768
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/edit/TableAddRow.java
@@ -0,0 +1,65 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.elements.edit;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.expression.Expression;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.form.Button;
+import com.github.deutschebank.symphony.workflow.form.Button.Type;
+import com.github.deutschebank.symphony.workflow.java.ClassBasedWorkflow;
+import com.github.deutschebank.symphony.workflow.response.FormResponse;
+import com.github.deutschebank.symphony.workflow.response.Response;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.AbstractElementsConsumer;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.ElementsAction;
+
+
+
+public class TableAddRow extends AbstractElementsConsumer {
+	
+	SpelExpressionParser spel = new SpelExpressionParser();
+	
+
+	public static final String ACTION_SUFFIX = "table-add-row";
+	public static final String DO_SUFFIX = "table-add-done";
+
+
+	@Override
+	public List<Response> apply(ElementsAction ea) {
+		Workflow wf = ea.getWorkflow();
+		String verb = ea.getAction();
+		if (verb == null) {
+			return null;
+		}
+		if (verb.endsWith(ACTION_SUFFIX)) {
+			String tableLocation = verb.substring(0, verb.length() - ACTION_SUFFIX.length()-1);
+			tableLocation = TableEditRow.fixSpel(tableLocation);
+			Expression e = spel.parseExpression(tableLocation);
+			TypeDescriptor td  = e.getValueTypeDescriptor(ea.getWorkflowObject());
+			Class<?> c = td.getResolvableType().getGeneric(0).resolve();
+			
+			Object out;
+			try {
+				out = c.newInstance();
+			} catch (Exception e1) {
+				throw new UnsupportedOperationException("Can't instantiate", e1);
+			}
+			return Collections.singletonList(new FormResponse(wf, ea.getRoom(), ea.getWorkflowObject(), "New "+ClassBasedWorkflow.getName(c), "Provide details for the new row", out, true, Collections.singletonList(new Button(tableLocation+"."+DO_SUFFIX, Type.ACTION, "Add"))));
+		} else if (verb.endsWith(DO_SUFFIX)) {
+			Object data = ea.getWorkflowObject();
+			String tableLocation = verb.substring(0, verb.length() - DO_SUFFIX.length()-1);
+			tableLocation = TableEditRow.fixSpel(tableLocation);
+			Expression e = spel.parseExpression(tableLocation);
+			Object updated = ea.getFormData();
+			List<Object> listToUpdate = (List<Object>) e.getValue(data);
+			listToUpdate.add(updated);
+			return Collections.singletonList(new FormResponse(wf, ea.getRoom(), data, ClassBasedWorkflow.getName(data.getClass()), ClassBasedWorkflow.getInstructions(data.getClass()), data, false, wf.gatherButtons(data, ea.getRoom())));
+		}
+		
+		return null;
+	}
+	
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/edit/TableDeleteRows.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/edit/TableDeleteRows.java
new file mode 100644
index 000000000..c82468524
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/edit/TableDeleteRows.java
@@ -0,0 +1,78 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.elements.edit;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.springframework.expression.Expression;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.java.ClassBasedWorkflow;
+import com.github.deutschebank.symphony.workflow.response.FormResponse;
+import com.github.deutschebank.symphony.workflow.response.Response;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.AbstractElementsConsumer;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.ElementsAction;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.FormConverter;
+
+public class TableDeleteRows extends AbstractElementsConsumer {
+	
+	SpelExpressionParser spel = new SpelExpressionParser();
+
+	public static final String ACTION_SUFFIX = "table-delete-rows";
+	public static final String SELECT_SUFFIX = "selected";
+
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<Response> apply(ElementsAction ea) {
+		Workflow wf = ea.getWorkflow();
+		String verb = ea.getAction();
+		if (verb == null) {
+			return null;
+		}
+		if (verb.endsWith(ACTION_SUFFIX)) {
+			
+			// get the table to modify
+			Object data = ea.getWorkflowObject();
+			String tableLocation = verb.substring(0, verb.length() - ACTION_SUFFIX.length()-1);
+			tableLocation = TableEditRow.fixSpel(tableLocation);
+			Expression e = spel.parseExpression(tableLocation);
+			List<Object> table = (List<Object>) e.getValue(data);
+			Object deleteStructure = ((FormConverter.UnconvertedContent)ea.getFormData()).structure;
+			
+			String mapLocation = convertSpelToMapSpel(tableLocation);
+			e = spel.parseExpression(mapLocation);
+			List<Integer> toRemove = getRowsToDelete((List<Object>) e.getValue(deleteStructure));
+			
+			for (Integer i : toRemove) {
+				table.remove((int) i);
+			}
+			
+			return Collections.singletonList(new FormResponse(wf, ea.getRoom(), data, ClassBasedWorkflow.getName(data.getClass()), ClassBasedWorkflow.getInstructions(data.getClass()), data, false, wf.gatherButtons(data, ea.getRoom())));
+		}
+		
+		return null;
+	}
+
+	private String convertSpelToMapSpel(String tableLocation) {
+		return String.join(".", Arrays.stream(tableLocation.split("\\."))
+			.map(i -> i.startsWith("[") ? i : "['" + i + "']")
+			.toArray(i -> new String[i]));
+	}
+
+	@SuppressWarnings("unchecked")
+	private List<Integer> getRowsToDelete(List<Object> value) {
+		return IntStream.range(0, value.size())
+			.filter(i -> {
+				Object val = value.get(i);
+				return (val != null) && ((Map<String, Object>) val).containsKey("selected");
+			})
+			.mapToObj(i -> i)
+			.sorted(Collections.reverseOrder())
+			.collect(Collectors.toList());
+	}
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/edit/TableEditRow.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/edit/TableEditRow.java
new file mode 100644
index 000000000..61af39c1b
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/elements/edit/TableEditRow.java
@@ -0,0 +1,67 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.elements.edit;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.expression.Expression;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.form.Button;
+import com.github.deutschebank.symphony.workflow.form.Button.Type;
+import com.github.deutschebank.symphony.workflow.java.ClassBasedWorkflow;
+import com.github.deutschebank.symphony.workflow.response.FormResponse;
+import com.github.deutschebank.symphony.workflow.response.Response;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.AbstractElementsConsumer;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.ElementsAction;
+
+
+public class TableEditRow  extends AbstractElementsConsumer {
+	
+	SpelExpressionParser spel = new SpelExpressionParser();
+
+	public static final String EDIT_SUFFIX = "table-edit-row";
+	
+	public static final String UPDATE_SUFFIX = "table-update";
+
+	public static String fixSpel(String in) {
+		return in.replace(".[", "[");
+	}
+	
+	@Override
+	public List<Response> apply(ElementsAction in) {
+		Workflow wf = in.getWorkflow();
+		String verb = in.getAction();
+		if (verb == null) {
+			return null;
+		}
+		
+		if (verb.endsWith(EDIT_SUFFIX)) {
+			Object data = in.getWorkflowObject();
+			String tableLocation = verb.substring(0, verb.length() - EDIT_SUFFIX.length()-1);
+			tableLocation = fixSpel(tableLocation);
+			Expression e = spel.parseExpression(tableLocation);
+			Object o = e.getValue(data);
+			Class<?> c = o.getClass();
+			return Collections.singletonList(new FormResponse(wf, in.getRoom(), in.getWorkflowObject(), "Edit "+ClassBasedWorkflow.getName(c), "Update Row Details", o, true, Collections.singletonList(new Button(tableLocation+"."+UPDATE_SUFFIX, Type.ACTION, "Update"))));
+		} else if (verb.endsWith(UPDATE_SUFFIX)) {
+			Object data = in.getWorkflowObject();
+			String tableLocation = verb.substring(0, verb.length() - UPDATE_SUFFIX.length()-1);
+			tableLocation = fixSpel(tableLocation);
+			int lastBracket = tableLocation.lastIndexOf('[');
+			int row = Integer.parseInt(tableLocation.substring(lastBracket+1, tableLocation.length()-1));
+			tableLocation = tableLocation.substring(0, lastBracket);
+			Object updated = in.getFormData();
+			Expression e = spel.parseExpression(tableLocation);
+			List<Object> listToUpdate = (List<Object>) e.getValue(data);
+			listToUpdate.set(row, updated);
+			Class<?> c = data.getClass();
+			return Collections.singletonList(new FormResponse(wf, in.getRoom(), data, ClassBasedWorkflow.getName(c), ClassBasedWorkflow.getInstructions(c), data, false, wf.gatherButtons(data, in.getRoom())));
+		}
+		
+		return null;
+	}
+
+	
+	
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/AttachmentHandler.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/AttachmentHandler.java
new file mode 100644
index 000000000..f90f4ad85
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/AttachmentHandler.java
@@ -0,0 +1,8 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.handlers;
+
+import com.github.deutschebank.symphony.workflow.response.AttachmentResponse;
+
+public interface AttachmentHandler {
+
+	public Object formatAttachment(AttachmentResponse ar);
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/EntityJsonConverter.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/EntityJsonConverter.java
new file mode 100644
index 000000000..e28a6434e
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/EntityJsonConverter.java
@@ -0,0 +1,99 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.handlers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.detuschebank.symphony.json.EntityJson;
+import com.github.detuschebank.symphony.json.EntityJsonTypeResolverBuilder.VersionSpace;
+import com.github.deutschebank.symphony.workflow.AbstractNeedsWorkflow;
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.content.Room;
+import com.github.deutschebank.symphony.workflow.content.RoomDef;
+import com.github.deutschebank.symphony.workflow.content.User;
+import com.github.deutschebank.symphony.workflow.content.UserDef;
+import com.github.detuschebank.symphony.json.ObjectMapperFactory;
+
+/**
+ * Converts workflow objects to/from JSON.
+ */
+public class EntityJsonConverter extends AbstractNeedsWorkflow {
+
+	private static final String WORKFLOW_001 = "workflow_001";
+
+	ObjectMapper om;
+	
+	public EntityJsonConverter(Workflow wf) {
+		super(wf);
+		List<Class<?>> extendedClassSpace = new ArrayList<Class<?>>();
+		extendedClassSpace.add(RoomDef.class);
+		extendedClassSpace.add(UserDef.class);
+		extendedClassSpace.add(User.class);
+		extendedClassSpace.add(Room.class);
+		extendedClassSpace.addAll(wf.getDataTypes());
+		VersionSpace[] vs = extendedClassSpace.stream().map(c -> new VersionSpace(c.getCanonicalName(), "1.0")).toArray(s -> new VersionSpace[s]);
+		om = ObjectMapperFactory.initialize(ObjectMapperFactory.extendedSymphonyVersionSpace(vs));		
+		om.enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS);
+		om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+	}
+
+	public Object readWorkflowValue(String json) {
+		try {
+			if (json == null) {
+				return null;
+			}
+
+			return readValue(json).get(WORKFLOW_001);
+		} catch (Exception e) {
+			System.out.println(json);
+			throw new UnsupportedOperationException("Map Fail", e);
+		}
+	}
+
+	public String toWorkflowJson(Object o) {
+		try {
+			if (o == null) {
+				return null;
+			}
+			EntityJson out = new EntityJson();
+			out.put(WORKFLOW_001, o);
+			return om.writeValueAsString(out);
+		} catch (Exception e) {
+			throw new UnsupportedOperationException("Map Fail", e);
+		}
+	}
+
+	public EntityJson readValue(String json) {
+		try {
+			if (json == null) {
+				return null;
+			}
+			return om.readValue(json, EntityJson.class);
+		} catch (Exception e) {
+			throw new UnsupportedOperationException("Map Fail", e);
+		}
+	}
+
+	public String writeValue(EntityJson ej) {
+		try {
+			return ej == null ? null : om.writeValueAsString(ej);
+		} catch (Exception e) {
+			throw new UnsupportedOperationException("Map Fail", e);
+		}
+	}
+
+	public Object fromJson(String formId, Object json) {
+		Class<?> c;
+		try {
+			c = Class.forName(formId);
+		} catch (ClassNotFoundException e1) {
+			throw new UnsupportedOperationException("Couldn't get class: " + formId);
+		}
+		Object updated = om.convertValue(json, c);
+		return updated;
+	}
+
+
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/FormMessageMLConverter.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/FormMessageMLConverter.java
new file mode 100644
index 000000000..ce27c1f3b
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/FormMessageMLConverter.java
@@ -0,0 +1,389 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.handlers;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+
+import org.springframework.util.StringUtils;
+import org.springframework.validation.Errors;
+import org.springframework.web.util.HtmlUtils;
+
+import com.github.deutschebank.symphony.workflow.content.Author;
+import com.github.deutschebank.symphony.workflow.content.ID;
+import com.github.deutschebank.symphony.workflow.content.Room;
+import com.github.deutschebank.symphony.workflow.content.Tag;
+import com.github.deutschebank.symphony.workflow.content.User;
+import com.github.deutschebank.symphony.workflow.form.Button;
+import com.github.deutschebank.symphony.workflow.sources.symphony.TagSupport;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.edit.TableAddRow;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.edit.TableDeleteRows;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.edit.TableEditRow;
+import com.github.deutschebank.symphony.workflow.sources.symphony.room.SymphonyRooms;
+import com.github.deutschebank.symphony.workflow.validation.ErrorHelp;
+
+/**
+ * Takes a bean and converts it into a form with either an editable or display
+ * version of MessageML.
+ * 
+ * @author Rob Moffat
+ *
+ */
+public class FormMessageMLConverter {
+
+	private static final String CENTER_ALIGN = "style=\"text-align:center;\" ";
+	public static final String RIGHT_ALIGN = "style=\"text-align: right;\"";
+
+	enum Mode {
+		DISPLAY, DISPLAY_WITH_BUTTONS, FORM
+	};
+	
+	SymphonyRooms ru;
+	
+	public FormMessageMLConverter(SymphonyRooms ru) {
+		this.ru = ru;
+	}
+
+	public String convert(Class<?> c, Object o, List<Button> actions, boolean editMode, Errors e) {
+		StringBuilder sb = new StringBuilder();
+		Mode m = editMode ? Mode.FORM : ((actions.size() > 0) ? Mode.DISPLAY_WITH_BUTTONS : Mode.DISPLAY);
+		if (o instanceof String) {
+			sb.append(o.toString());
+		} else {
+			// convert to an object form
+			if (m == Mode.FORM) {
+				sb.append("<form " + attribute("id", c.getCanonicalName()) + ">");
+			} else {
+				sb.append("<table>");
+			}
+			if (m == Mode.FORM) {
+				sb.append(withFields(c, o, formField, true, e));
+			} else {
+				sb.append(withFields(c, o, formDisplay, false, e));
+			}
+			if (m == Mode.DISPLAY_WITH_BUTTONS) {
+				sb.append("</table><form " + attribute("id", c.getCanonicalName()) + ">");
+				sb.append(handleButtons(actions));
+				sb.append("</form>");
+			} else if (m == Mode.FORM) {
+				sb.append(handleButtons(actions));
+				sb.append("</form>");
+			} else {
+				sb.append("</table>");
+			}
+		}
+
+		return sb.toString();
+	}
+
+	private String handleButtons(List<Button> actions) {
+		StringBuilder sb = new StringBuilder();
+		sb.append("<p>");
+		for (Button button : actions) {
+			sb.append("<button ");
+			sb.append(attribute("name", button.getName()));
+			sb.append(attribute("type", button.getType().toString().toLowerCase()));
+			sb.append(">");
+			sb.append(HtmlUtils.htmlEscape(button.getText()));
+			sb.append("</button>");
+		}
+		sb.append("</p>");
+		return sb.toString();
+	}
+
+	static interface WithField {
+
+		public String apply(Class<?> beanClass, Object bean, Field f, boolean editMode, Errors e);
+
+	}
+
+	public WithField formField = (beanClass, bean, f, editMode, e) -> {
+		Class<?> c = f.getType();
+		if (String.class.isAssignableFrom(c)) {
+			return convertTextField((String) bean, e, editMode, f.getName());
+		} else if (numberClass(c)) {
+			return convertNumberField((Number) bean, e, editMode, f.getName());
+		} else if (Collection.class.isAssignableFrom(c)) {
+			Class<?> elementClass = (Class<?>) ((ParameterizedType) f.getGenericType()).getActualTypeArguments()[0];
+			return convertTable(elementClass, (Collection<?>) bean, e, editMode);
+		} else if (boolClass(c)) {
+			return convertCheckboxField((Boolean) bean, e, editMode, f.getName());
+		} else if (Author.class.isAssignableFrom(c)) {
+			return convertAuthor((Author) bean, e, editMode, f.getName());			
+		} else if (User.class.isAssignableFrom(c)) {
+			return convertUser((User) bean, e, editMode, f.getName());
+		} else if (ID.class.isAssignableFrom(c)) {
+			return convertID((ID) bean, e, editMode, f.getName());
+		} else if (Tag.class.isAssignableFrom(c)) {
+			return convertTag((Tag) bean, e, editMode, f.getName());
+		} else if (c.isEnum()) {
+			return convertEnum((Enum<?>) bean, e, c, editMode, f.getName());
+		} else if (Room.class.isAssignableFrom(c)) {
+			return convertRoom((Room) bean, e, c, editMode, f.getName());
+		} else {
+			return convertInner(beanClass, bean, editMode, e);
+		}
+	};
+
+	private boolean numberClass(Class<?> c) {
+		return Number.class.isAssignableFrom(c);
+	}
+
+	private String convertRoom(Room r, Errors e, Class<?> c, boolean editMode, String name) {
+		if (editMode) {
+			return renderDropdown(r, e, ru.getAllRooms(), name, (o) -> o.getId(), (o) -> o.getRoomName());
+		} else if (r != null){
+			return r.getRoomName();
+		} else {
+			return "";
+		}
+	}
+
+	/**
+	 * This converts tags that aren't users.  So, hashtags and cashtags only.
+	 * For these tags, the id and the name are the same thing, so we only need to 
+	 * worry about one of those
+	 */
+	private String convertTag(Tag bean, Errors e, boolean editMode, String name) {
+		if (editMode) {
+			return convertTextField(bean.getText(), e, editMode, "$cashtag or $hashtag");
+		} else {
+			return TagSupport.format(bean);
+		}
+	}
+	
+	private String convertID(ID id, Errors e, boolean editMode, String name) {
+		return TagSupport.format(id);
+	}
+
+	private String convertEnum(Enum<?> n, Errors e, Class<?> c, boolean editMode, String name) {
+		if (editMode) {
+			return renderDropdown(n, e, Arrays.asList(c.getEnumConstants()), name, (g) -> ((Enum<?>)g).name(), (g) -> g.toString());
+		} else if (n != null) {
+			return n.toString();
+		} else {
+			return "";
+		}
+	}
+
+	private <V> String renderDropdown(V selected, Errors e, Collection<V> options, String name, Function<V, String> keyFunction, Function<V, String> displayFunction) {
+		StringBuilder out = new StringBuilder();
+		out.append("<select "+ attribute("name", e.getNestedPath()));
+		out.append(attribute("required", "false"));
+		out.append(attribute("data-placeholder", "Choose "+name));
+		out.append(">");
+		
+		Object selectedKey = selected == null ? null : keyFunction.apply(selected);
+		
+		for (V o : options) {
+			out.append("<option ");
+			out.append(attribute("value", keyFunction.apply(o)));
+			if (keyFunction.apply(o).equals(selectedKey)) {
+				out.append(attribute("selected", "true"));
+			}
+			out.append(">");
+			out.append(displayFunction.apply(o));
+			out.append("</option>");
+		}
+		
+		out.append("</select>");
+		return out.toString();
+	}
+
+	private String convertInner(Class<?> c, Object o, boolean editMode, Errors e) {
+		StringBuilder sb = new StringBuilder();
+		if (o instanceof String) {
+			sb.append(o.toString());
+		} else {
+			// convert to an object form
+			sb.append("<table>");
+			if (editMode) {
+				sb.append(withFields(c, o, formField, true, e));
+			} else {
+				sb.append(withFields(c, o, formDisplay, false, e));
+			}
+			sb.append("</table>");
+		}
+
+		return sb.toString();
+	}
+
+	private boolean boolClass(Class<?> c) {
+		return (Boolean.class.isAssignableFrom(c)) || (boolean.class.isAssignableFrom(c));
+	}
+
+	private WithField formDisplay = (beanClass, bean, f, editMode, e) -> {
+		return "<tr><td><b>" + f.getName() + ":</b></td><td>" + formField.apply(beanClass, bean, f, editMode, e) + "</td></tr>";
+	};
+
+	private WithField tableDisplay = (beanClass, bean, f, editMode, e) -> {
+		String align = numberClass(f.getType()) ? RIGHT_ALIGN : (boolClass(f.getType()) ? CENTER_ALIGN : "");
+		return "<td " + align + ">" + formField.apply(beanClass, bean, f, editMode, e) + "</td>";
+	};
+
+	private WithField tableColumnNames = (beanClass, bean, f, editMode, e) -> {
+		String align = numberClass(f.getType()) ? RIGHT_ALIGN : (boolClass(f.getType()) ? CENTER_ALIGN : "");
+		return "<td " + align + "><b>" + f.getName() + "</b></td>";
+	};
+
+	private String withFields(Class<?> c, Object bean, WithField action, boolean editMode, Errors e) {
+		StringBuilder out = new StringBuilder();
+		if ((c != Object.class) && (c!=null)) {
+			out.append(withFields(c.getSuperclass(), bean, action, editMode, e));
+
+			for (Field f : c.getDeclaredFields()) {
+				if (!Modifier.isStatic(f.getModifiers())) {
+					f.setAccessible(true);
+					e.pushNestedPath(f.getName());
+					Object value;
+					try {
+						value = bean != null ? f.get(bean) : null;
+					} catch (Exception e1) {
+						throw new UnsupportedOperationException(
+								"Couldn't get value of field " + f.getName() + " on object " + bean);
+					}
+					String text = action.apply(c, value, f, editMode, e);
+					out.append(text);
+					e.popNestedPath();
+				}
+			}
+		}
+
+		return out.toString();
+	}
+
+	private String convertTable(Class<?> elementClass, Collection<?> collection, Errors e, boolean editMode) {
+		StringBuilder sb = new StringBuilder();
+		sb.append(ErrorHelp.errors(e));
+		sb.append("<table><thead><tr>");
+		sb.append(withFields(elementClass, null, tableColumnNames, editMode, e));
+		if (editMode) {
+			sb.append("<td " + CENTER_ALIGN + "><button name=\"" + e.getNestedPath() + TableDeleteRows.ACTION_SUFFIX
+					+ "\">Delete</button></td>");
+			sb.append("<td " + CENTER_ALIGN + "><button name=\"" + e.getNestedPath() + TableAddRow.ACTION_SUFFIX
+					+ "\">New</button></td>");
+		}
+		sb.append("</tr></thead><tbody>");
+		int i = 0;
+
+		if (collection != null) {
+			for (Object o : collection) {
+				sb.append("<tr>");
+				e.pushNestedPath("[" + i + "]");
+				sb.append(withFields(elementClass, o, tableDisplay, false, e));
+				if (editMode) {
+					sb.append("<td " + CENTER_ALIGN + "><checkbox name=\"" + e.getNestedPath()
+							+ TableDeleteRows.SELECT_SUFFIX + "\" /></td>");
+					sb.append("<td " + CENTER_ALIGN + "><button name=\"" + e.getNestedPath() + TableEditRow.EDIT_SUFFIX
+							+ "\">Edit</button></td>");
+				}
+				e.popNestedPath();
+				sb.append("</tr>");
+				i++;
+			}
+		}
+
+		sb.append("</tbody></table>");
+		return sb.toString();
+	}
+
+	private String convertNumberField(Number n, Errors e, boolean editMode, String placeholder) {
+		if (editMode) {
+			return ErrorHelp.errors(e) + "<text-field " + attribute("name", e.getNestedPath())
+					+ attribute("placeholder", placeholder) +
+					/*
+					 * attribute("required", required)+ attribute("masked", masked)+
+					 * attribute("maxlength", maxLength)+ attribute("minlength", minLength)+
+					 */
+					">" + text(n == null ? "" : n.toString()) + "</text-field>";
+		} else if (n != null) {
+			return n.toString();
+		} else {
+			return "";
+		}
+	}
+
+	private String convertUser(User bean, Errors e, boolean editMode, String name) {
+		if (editMode) {
+			return ErrorHelp.errors(e) + "<person-selector " 
+					+ attribute("name", e.getNestedPath()) +
+				 "placeholder=\"Search for someone\" required=\"false\"/>";
+		} else if (bean == null) {
+			return "-- no user --";
+		} else {
+			return TagSupport.format(bean);
+		}
+	}
+	
+	private String convertAuthor(Author bean, Errors e, boolean editMode, String name) {
+		if (editMode) {
+			return "";
+		} else if (bean == null) {
+			return "-- no user --";
+		} else {
+			return TagSupport.format(bean);
+		}
+	}
+
+	private String convertTextField(String value, Errors e, boolean editMode, String placeholder) {
+		if (editMode) {
+			return ErrorHelp.errors(e) + "<text-field " + attribute("name", e.getNestedPath())
+					+ attribute("placeholder", placeholder) +
+					">" + text(value) + "</text-field>";
+		} else {
+			return value;
+		}
+	}
+
+	public String convertCheckboxField(Boolean value, Errors e, boolean editMode, String name) {
+		if (editMode) {
+			return ErrorHelp.errors(e) + "<checkbox " + attribute("name", e.getNestedPath())
+					+ attribute("checked", value) + attribute("value", "true") + ">" + text(name) + "</checkbox>";
+		} else {
+			return value ? "Y" : "N";
+		}
+	}
+
+	public static String attribute(String name, String value) {
+		if (!StringUtils.isEmpty(value)) {
+			return name + "=\"" + HtmlUtils.htmlEscape(value) + "\" ";
+		} else {
+			return "";
+		}
+	}
+
+	public static String attribute(String name, Boolean value) {
+		if (value != null) {
+			return name + "=\"" + value + "\" ";
+		} else {
+			return "";
+		}
+	}
+
+	public static String attribute(String name, Integer value) {
+		if (value != null) {
+			return name + "=\"" + value + "\" ";
+		} else {
+			return "";
+		}
+	}
+
+	public static String text(String value) {
+		if (value != null) {
+			return HtmlUtils.htmlEscape(value);
+		} else {
+			return "";
+		}
+	}
+
+	public static <T> BinaryOperator<T> throwingMerger() {
+		return (u, v) -> {
+			throw new IllegalStateException(String.format("Duplicate key %s", u));
+		};
+	}
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/ResponseHandler.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/ResponseHandler.java
new file mode 100644
index 000000000..487031549
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/ResponseHandler.java
@@ -0,0 +1,9 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.handlers;
+
+import java.util.function.Consumer;
+
+import com.github.deutschebank.symphony.workflow.response.Response;
+
+public interface ResponseHandler extends Consumer<Response> {
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/SymphonyResponseHandler.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/SymphonyResponseHandler.java
new file mode 100644
index 000000000..9878bfc48
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/SymphonyResponseHandler.java
@@ -0,0 +1,87 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.handlers;
+
+import com.github.deutschebank.symphony.workflow.response.AttachmentResponse;
+import com.github.deutschebank.symphony.workflow.response.DataResponse;
+import com.github.deutschebank.symphony.workflow.response.ErrorResponse;
+import com.github.deutschebank.symphony.workflow.response.FormResponse;
+import com.github.deutschebank.symphony.workflow.response.MessageResponse;
+import com.github.deutschebank.symphony.workflow.response.Response;
+import com.github.deutschebank.symphony.workflow.sources.symphony.TagSupport;
+import com.github.deutschebank.symphony.workflow.sources.symphony.room.SymphonyRooms;
+import com.symphony.api.agent.MessagesApi;
+
+/**
+ * This is responsible for taking {@link Response} objects and pushing them back to Symphony.
+ * 
+ * @author Rob Moffat
+ *
+ */
+public class SymphonyResponseHandler implements ResponseHandler {
+
+	MessagesApi messagesApi;
+	FormMessageMLConverter formConverter;
+	EntityJsonConverter jsonConverter;
+	SymphonyRooms ru;
+	AttachmentHandler ah;
+	
+	public SymphonyResponseHandler(MessagesApi api, FormMessageMLConverter fmc, EntityJsonConverter ejc, SymphonyRooms ru, AttachmentHandler ah) {
+		this.messagesApi = api;
+		this.formConverter = fmc;
+		this.jsonConverter = ejc;
+		this.ru = ru;
+		this.ah = ah;
+	}
+	
+	@Override
+	public void accept(Response t) {
+		if (t instanceof FormResponse) {
+			processFormResponse((FormResponse) t);
+		} else if (t instanceof ErrorResponse) {
+			processErrorResponse((ErrorResponse) t);
+		} else if (t instanceof MessageResponse) {
+			processMessageResponse((MessageResponse) t);
+		} else if (t instanceof AttachmentResponse) {
+			processAttachmentResponse((AttachmentResponse) t);
+		} else if (t != null) {
+			throw new UnsupportedOperationException("Couldn't process response of type "+t.getClass());
+		}
+	}
+
+	private void processAttachmentResponse(AttachmentResponse t) {
+		processDataResponse("", t, ah.formatAttachment(t));
+	}
+
+	private void processErrorResponse(MessageResponse t) {
+		processDataResponse("!"+t.getMessage(), t, null);
+	}
+
+	private void processMessageResponse(MessageResponse t) {
+		processDataResponse(t.getMessage(), t, null);
+	}
+
+	private void processFormResponse(FormResponse t) {
+		String convertedForm = formConverter.convert(t.getFormClass(), t.getFormObject(), t.getButtons(), t.isEditable(), t.getErrors());
+		processDataResponse(convertedForm, t, null);
+	}
+
+
+	private void processDataResponse(String messageBody, DataResponse t, Object attachment) {
+		String tags = createWorkflowHeader(t);
+		String outMessage = "<messageML>"+tags+messageBody+"</messageML>";
+		String json = jsonConverter.toWorkflowJson(t.getData());
+		String streamId = ru.getStreamFor(t.getAddress());
+		messagesApi.v4StreamSidMessageCreatePost(null, streamId, outMessage, json, null, attachment, null, null);
+	}
+	
+	private String createWorkflowHeader(DataResponse dr) {
+		return " <card accent=\"tempo-bg-color--blue\"><header><h3>" + dr.getName() +"</h3></header>" + 
+				"<body><p>"+
+				dr.getInstructions()+
+				TagSupport.toHashTag(dr.getWorkflow())+
+				TagSupport.toHashTag("symphony-workflow")+
+				TagSupport.classHashTags(dr.getData()) + 
+				"</p></body>" +
+				"  </card>";
+	}
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/jersey/JerseyAttachmentHandlerConfig.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/jersey/JerseyAttachmentHandlerConfig.java
new file mode 100644
index 000000000..00842ae62
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/handlers/jersey/JerseyAttachmentHandlerConfig.java
@@ -0,0 +1,38 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.handlers.jersey;
+
+import java.io.File;
+import java.io.FileOutputStream;
+
+import org.glassfish.jersey.media.multipart.file.FileDataBodyPart;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.github.deutschebank.symphony.workflow.response.AttachmentResponse;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.AttachmentHandler;
+
+@Configuration
+//@ConditionalOnClass(FileDataBodyPart.class)
+public class JerseyAttachmentHandlerConfig  {
+
+	@Bean
+	public AttachmentHandler attachmentHandler() {
+		return new AttachmentHandler() {
+			
+			@Override
+			public Object formatAttachment(AttachmentResponse ar) {
+				File temp;
+				try {
+					temp = File.createTempFile("workflow", ar.getSuffix());
+					FileOutputStream fos = new FileOutputStream(temp);
+					fos.write(ar.getAttachment());
+					fos.close();
+				} catch (Exception e) {
+					throw new RuntimeException("Couldn't create file", e);
+				}
+				FileDataBodyPart fdbp = new FileDataBodyPart("attachment", temp);
+				return fdbp;
+			}
+		};
+	}
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/history/MessageHistory.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/history/MessageHistory.java
new file mode 100644
index 000000000..191cd80a4
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/history/MessageHistory.java
@@ -0,0 +1,80 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.history;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import com.github.deutschebank.symphony.workflow.AbstractNeedsWorkflow;
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.content.Addressable;
+import com.github.deutschebank.symphony.workflow.history.History;
+import com.github.deutschebank.symphony.workflow.sources.symphony.TagSupport;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.EntityJsonConverter;
+import com.github.deutschebank.symphony.workflow.sources.symphony.room.SymphonyRooms;
+import com.symphony.api.agent.MessagesApi;
+import com.symphony.api.model.MessageSearchQuery;
+import com.symphony.api.model.V4MessageList;
+
+public class MessageHistory extends AbstractNeedsWorkflow implements History {
+
+	EntityJsonConverter jsonConverter;
+	MessagesApi messageApi;
+	SymphonyRooms ru;
+	
+	public MessageHistory(Workflow wf, EntityJsonConverter jsonConverter, MessagesApi messageApi, SymphonyRooms ru) {
+		super(wf);
+		this.jsonConverter = jsonConverter;
+		this.messageApi = messageApi;
+		this.ru = ru;
+		wf.registerHistoryProvider(this);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public <X> Optional<X> getLastFromHistory(Class<X> type, Addressable address) {
+		String hashtag = TagSupport.formatTag(type);
+		MessageSearchQuery msq = new MessageSearchQuery().hashtag(hashtag).streamId(ru.getStreamFor(address));
+		V4MessageList out = messageApi.v1MessageSearchPost(msq, null, null, 0, 1, null, null);
+		
+		if (out.size() == 1) {
+			Object o = jsonConverter.readWorkflowValue(out.get(0).getData());
+			if (type.isAssignableFrom(o.getClass())) {
+				return Optional.of((X) o);
+			} else {
+				throw new RuntimeException("Tagged with "+hashtag+" but actually a" +o.getClass());
+			}
+		} else {
+			return Optional.empty();
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public <X> List<X> getFromHistory(Class<X> type, Addressable address, Instant since) {
+		String hashtag = TagSupport.formatTag(type);
+		MessageSearchQuery msq = new MessageSearchQuery()
+				.hashtag(hashtag)
+				.fromDate(since.toEpochMilli())
+				.streamId(ru.getStreamFor(address));
+		V4MessageList out = messageApi.v1MessageSearchPost(msq, null, null, 0, 50, null, null);
+				
+		return out.stream()
+			.map(msg -> {
+				try {
+					Object done = jsonConverter.readWorkflowValue(msg.getData());
+					if (type.isAssignableFrom(done.getClass())) {
+						return (X) done;
+					} else {
+						return null;
+					}
+				} catch (Exception e1) {
+					e1.printStackTrace();
+					return null;
+				}
+			})
+			.filter(e -> e != null)
+			.collect(Collectors.toList());
+
+	}
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/HelpMessageConsumer.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/HelpMessageConsumer.java
new file mode 100644
index 000000000..ad21f6436
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/HelpMessageConsumer.java
@@ -0,0 +1,47 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.messages;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import com.github.deutschebank.symphony.workflow.content.Word;
+import com.github.deutschebank.symphony.workflow.response.MessageResponse;
+import com.github.deutschebank.symphony.workflow.response.Response;
+
+/**
+ * Provides help to the user on what the bot can do.
+ * 
+ * @author Rob Moffat
+ *
+ */
+public class HelpMessageConsumer implements SimpleMessageConsumer {
+
+	@Override
+	public List<Response> apply(SimpleMessageAction sma) {
+		return sma.getWords().getNth(Word.class, 0)
+			.filter(w -> w.getIdentifier().equals("help"))
+			.map(w -> {
+				
+				Map<String, String> commands = new TreeMap<>(sma.getWorkflow().getCommands(sma.getRoom()));
+				String descriptions = renderDescriptions(commands);
+						
+				
+				return Collections.singletonList((Response) new MessageResponse(sma.getWorkflow(), sma.getRoom(), null, "Help", "This is what I can do:", descriptions));
+				
+			}).orElse(null);
+	}
+
+	
+	private String renderDescriptions(Map<String, String> commands) {
+		String out = "<form id=\".\"><table><thead><tr><td>Button</td><td>Or Type...</td><td>Description</td></tr></thead><tbody>" + 
+				commands.entrySet().stream()
+					.map(e -> "<tr><td><button name=\""+e.getKey()+"\" type=\"action\">"+e.getKey()+"</button></td><td><b> /"+ e.getKey() + "</b></td><td> "+ e.getValue()+"</td></tr>")
+					.reduce("", String::concat)
+				+"</tbody></table></form>";
+		System.out.println(out);
+		return out;
+	}
+
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/MethodCallMessageConsumer.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/MethodCallMessageConsumer.java
new file mode 100644
index 000000000..62c3fc6c0
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/MethodCallMessageConsumer.java
@@ -0,0 +1,19 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.messages;
+
+import java.util.List;
+import java.util.Optional;
+
+import com.github.deutschebank.symphony.workflow.content.Word;
+import com.github.deutschebank.symphony.workflow.response.Response;
+
+public class MethodCallMessageConsumer implements SimpleMessageConsumer {
+
+	@Override
+	public List<Response> apply(SimpleMessageAction sma) {
+		Optional<Word> firstWord = sma.getWords().getNth(Word.class, 0);
+		return firstWord.filter(w -> sma.getWorkflow().getCommands(sma.getRoom()).containsKey(w.getIdentifier()))
+				.map(w -> sma.getWorkflow().applyCommand(sma.getUser(), sma.getRoom(), w.getIdentifier(), null, sma.getWords()))
+				.orElse(null);
+	}
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/PresentationMLHandler.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/PresentationMLHandler.java
new file mode 100644
index 000000000..faf18753d
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/PresentationMLHandler.java
@@ -0,0 +1,118 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.messages;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+
+import com.github.detuschebank.symphony.json.EntityJson;
+import com.github.deutschebank.symphony.workflow.AbstractNeedsWorkflow;
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.content.Message;
+import com.github.deutschebank.symphony.workflow.content.Room;
+import com.github.deutschebank.symphony.workflow.content.User;
+import com.github.deutschebank.symphony.workflow.content.Word;
+import com.github.deutschebank.symphony.workflow.response.Response;
+import com.github.deutschebank.symphony.workflow.sources.symphony.SymphonyEventHandler;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.EntityJsonConverter;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.ResponseHandler;
+import com.github.deutschebank.symphony.workflow.sources.symphony.room.SymphonyRooms;
+import com.symphony.api.id.SymphonyIdentity;
+import com.symphony.api.model.StreamType.TypeEnum;
+import com.symphony.api.model.V4Event;
+import com.symphony.api.model.V4MessageSent;
+import com.symphony.api.pod.UsersApi;
+
+public class PresentationMLHandler extends AbstractNeedsWorkflow implements InitializingBean, SymphonyEventHandler {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(PresentationMLHandler.class);
+	
+	SymphonyIdentity botIdentity;
+	UsersApi usersApi;
+	SimpleMessageParser messageParser;
+	EntityJsonConverter jsonConverter;
+	List<SimpleMessageConsumer> messageConsumers;
+	ResponseHandler rh;
+	SymphonyRooms ruBuilder;
+		
+	public PresentationMLHandler(Workflow wf, SymphonyIdentity botIdentity, UsersApi usersApi, SimpleMessageParser messageParser,
+			EntityJsonConverter jsonConverter, List<SimpleMessageConsumer> messageConsumers, ResponseHandler rh, SymphonyRooms ruBuilder) {
+		super(wf);
+		this.botIdentity = botIdentity;
+		this.usersApi = usersApi;
+		this.messageParser = messageParser;
+		this.jsonConverter = jsonConverter;
+		this.messageConsumers = messageConsumers;
+		this.rh = rh;
+		this.ruBuilder = ruBuilder;
+	}
+
+	/**
+	 * Wont work across pods, probably
+	 */
+	private String botUserId;
+	
+
+	@Override
+	public void accept(V4Event t) {
+		try {
+			V4MessageSent ms = t.getPayload().getMessageSent();
+			if ((ms != null) && (!ms.getMessage().getUser().getEmail().equals(botIdentity.getEmail()))) {
+				
+				// ok, this is a message, and it's from a third party.  Parse it.
+				
+				EntityJson ej = jsonConverter.readValue(ms.getMessage().getData());
+				Message words = messageParser.parseMessage(ms.getMessage().getMessage(), ej);
+				TypeEnum streamType = TypeEnum.fromValue(ms.getMessage().getStream().getStreamType());
+				if (isForThisBot(words, streamType)) {
+					Room rr = ruBuilder.loadRoomById(ms.getMessage().getStream().getStreamId());
+					User u = ruBuilder.loadUserById(ms.getMessage().getUser().getUserId());
+					SimpleMessageAction sma = new SimpleMessageAction(wf, rr, u, words, ej);
+					for (SimpleMessageConsumer c : messageConsumers) {
+						try {
+							
+							List<Response> r = c.apply(sma);
+							if (r != null) {
+								r.stream()
+									.forEach(ri -> rh.accept(ri));
+							}
+							
+						} catch (Exception e) {
+							LOG.error("Failed to handle consumer "+c, e);
+						}
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Couldn't handle event "+t, e);
+		}
+	}
+
+	public boolean isForThisBot(Message words, TypeEnum streamType) {
+		try { 
+			boolean addressed = (streamType != TypeEnum.MIM) && (streamType != TypeEnum.ROOM);
+			
+			addressed = addressed || words.getNth(User.class, 0)
+				.filter(b -> b.getId().equals(botUserId))
+				.isPresent();
+			
+			
+			addressed = addressed || words.getNth(Word.class, 0)
+				.filter(w -> w.getText().startsWith("/"))
+				.isPresent();
+				
+			return addressed;
+			
+		} catch (Exception e) {
+			throw new UnsupportedOperationException(e);
+		}
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		botUserId = usersApi.v1UserGet(botIdentity.getEmail(), null, true).getId().toString();
+	}
+
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/SimpleMessageAction.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/SimpleMessageAction.java
new file mode 100644
index 000000000..d53a446b6
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/SimpleMessageAction.java
@@ -0,0 +1,50 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.messages;
+
+import java.util.List;
+
+import com.github.detuschebank.symphony.json.EntityJson;
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.content.Message;
+import com.github.deutschebank.symphony.workflow.content.Room;
+import com.github.deutschebank.symphony.workflow.content.User;
+import com.github.deutschebank.symphony.workflow.sources.symphony.Action;
+
+public class SimpleMessageAction implements Action {
+	
+	private final Workflow w;
+	private final Room r;
+	private final User u;
+	private final Message words;
+	private final EntityJson data;
+
+	public SimpleMessageAction(Workflow w, Room r, User u, Message words, EntityJson ej) {
+		super();
+		this.w = w;
+		this.r = r;
+		this.u = u;
+		this.words = words;
+		this.data = ej;
+	}
+
+	@Override
+	public Room getRoom() {
+		return r;
+	}
+
+	@Override
+	public User getUser() {
+		return u;
+	}
+
+	public Message getWords() {
+		return words;
+	}
+
+	public EntityJson getData() {
+		return data;
+	}
+
+	public Workflow getWorkflow() {
+		return w;
+	}
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/SimpleMessageConsumer.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/SimpleMessageConsumer.java
new file mode 100644
index 000000000..cb4101ec4
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/SimpleMessageConsumer.java
@@ -0,0 +1,18 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.messages;
+
+import java.util.List;
+import java.util.function.Function;
+
+import com.github.deutschebank.symphony.workflow.response.Response;
+
+/**
+ * Deals with simple text-commands coming from users, to start workflows etc.  
+ * 
+ * @author Rob Moffat
+ * 
+ * First argument of apply is the stream id, the next is the words.
+ *
+ */
+public interface SimpleMessageConsumer extends Function<SimpleMessageAction, List<Response>> {
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/SimpleMessageParser.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/SimpleMessageParser.java
new file mode 100644
index 000000000..d6dbec482
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/messages/SimpleMessageParser.java
@@ -0,0 +1,328 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.messages;
+
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.symphonyoss.fin.Security;
+import org.symphonyoss.taxonomy.Hashtag;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+import com.github.detuschebank.symphony.json.EntityJson;
+import com.github.deutschebank.symphony.workflow.content.Content;
+import com.github.deutschebank.symphony.workflow.content.Message;
+import com.github.deutschebank.symphony.workflow.content.Paragraph;
+import com.github.deutschebank.symphony.workflow.content.PastedTable;
+import com.github.deutschebank.symphony.workflow.content.Tag;
+import com.github.deutschebank.symphony.workflow.content.TagDef;
+import com.github.deutschebank.symphony.workflow.content.UserDef;
+import com.github.deutschebank.symphony.workflow.content.Word;
+import com.github.deutschebank.symphony.workflow.content.Tag.Type;
+import com.symphony.user.Mention;
+
+/**
+ * Provides functionality for simple command messages.  i.e. those likely to have been typed in by users.
+ * Will deliberately barf when it encounters tables, or lists, or something that is not just a list of words and hash/cash/mention tags on a line.
+ * 
+ * @author Rob Moffat
+ *
+ */
+public class SimpleMessageParser {
+	
+	private SAXParserFactory factory = SAXParserFactory.newInstance();
+	
+	static abstract class Frame<X extends Content> {
+		
+		abstract X getContents();
+		
+		abstract boolean isEnding(String qName);
+		
+		Frame<?> parent;
+		
+		abstract void push(Content c);
+		
+		abstract boolean hasContent();
+	}
+	
+	static class TagFrame extends TextFrame<Tag> {
+
+		String id;
+		Tag.Type type;
+		
+		@Override
+		public Tag getContents() {
+			if (type== Type.USER) {
+				return new UserDef(id, buf.substring(1), null);
+			} else {
+				return new TagDef(id, buf.substring(1), type);
+			}
+		}
+		
+		private void deReference(Object o) {
+			if (o instanceof Mention) {
+				id = ((Mention) o).getId().get(0).getValue();
+				type = Type.USER;
+			} else if (o instanceof Security) {
+				id = ((Security) o).getId().get(0).getValue();
+				type = Type.CASH;
+			} else if (o instanceof Hashtag) {
+				id = ((Hashtag) o).getValue();
+				type = Type.HASH;
+			} else {
+				throw new UnsupportedOperationException();
+			}
+		}
+
+		@Override
+		public boolean isEnding(String qName) {
+			return true;
+		}
+
+		@Override
+		public void push(Content c) {
+			throw new UnsupportedOperationException("Can't nest content in tag");
+		}
+
+		@Override
+		boolean hasContent() {
+			return true;
+		}
+	}
+	
+	static class TableFrame extends Frame<PastedTable> {
+		
+		private List<List<Content>> contents = new ArrayList<>();
+
+		void newRow() {
+			contents.add(new ArrayList<>());		
+		}
+		
+		@Override
+		public PastedTable getContents() {
+			return new PastedTable() {
+				
+				@Override
+				public List<List<Content>> getData() {
+					return contents.subList(1, contents.size());
+				}
+				
+				@Override
+				public List<Content> getColumnNames() {
+					return contents.get(0);
+				}
+
+				@Override
+				public int hashCode() {
+					return contents.hashCode();
+				}
+
+				@Override
+				public boolean equals(Object obj) {
+					if (obj instanceof PastedTable) {
+						return getData().equals(((PastedTable) obj).getData()) &&
+							getColumnNames().equals(((PastedTable) obj).getColumnNames());
+					} else {
+						return false;
+					}
+				}
+
+				@Override
+				public String toString() {
+					return "PastedTable ["+contents+"]";
+				}
+
+				@Override
+				public String getText() {
+					return "<pastedTable />";
+				}
+			};
+		}
+
+		@Override
+		public boolean isEnding(String qName) {
+			return qName.equals("table");
+		}
+
+		@Override
+		public void push(Content c) {
+			List<Content> lastRow = contents.get(contents.size()-1);
+			lastRow.add(c);
+		}
+
+		@Override
+		boolean hasContent() {
+			return contents.size()>0;
+		}
+		
+	}
+	
+	static abstract class TextFrame<X extends Content> extends Frame<X> {
+		
+		StringBuilder buf = new StringBuilder();
+		
+		void push(char[] ch, int start, int length) {
+			buf.append(ch, start, length);
+		}
+	}
+	
+	static class MessageFrame extends Frame<Message> {
+
+		List<Content> stuffSoFar = new ArrayList<>();
+		
+		public Message getContents() {
+			return Message.of(stuffSoFar);
+				
+		}
+		
+		void push(Content c) {
+			stuffSoFar.add(c);
+		}
+		
+		@Override
+		boolean isEnding(String qName) {
+			return true;
+		}
+
+		@Override
+		boolean hasContent() {
+			return stuffSoFar.size() > 0;
+		}
+	}
+	
+	static class ParagraphFrame extends TextFrame<Paragraph> {
+		
+		List<Content> stuffSoFar = new ArrayList<>();
+		
+		public Paragraph getContents() {
+			consumeBuffer();
+			return Paragraph.of(stuffSoFar);
+				
+		}
+		
+		void push(Content c) {
+			consumeBuffer();
+			stuffSoFar.add(c);
+		}
+
+		private void consumeBuffer() {
+			Arrays.stream(buf.toString().split("\\s+"))
+			.filter(s -> s.length() > 0)
+			.map(s -> Word.of(s))
+			.forEach(w -> stuffSoFar.add(w));
+			
+			buf.setLength(0);
+		}
+
+		@Override
+		boolean isEnding(String qName) {
+			return true;
+		}
+
+		@Override
+		boolean hasContent() {
+			return stuffSoFar.size() > 0;
+		}
+	}
+	
+	public Message parseMessage(String message, EntityJson jsonObjects) throws Exception {
+
+		Content [] out = { null };
+		
+		SAXParser saxParser = factory.newSAXParser();
+			saxParser.parse(new InputSource(new StringReader(message)), new DefaultHandler() {
+
+				Frame<?> top = null;
+
+				@Override
+				public void startElement(String uri, String localName, String qName, Attributes attributes)
+						throws SAXException {
+					
+					if (isStartTag(qName, attributes)) {
+						TagFrame tf = push(new TagFrame());
+						String dataEntityId = attributes.getValue("data-entity-id");
+						Object o = jsonObjects.get(dataEntityId);
+						tf.deReference(o);
+					} else if (isStartTable(qName, attributes)) {
+						TableFrame tf = push(new TableFrame());
+					} else if (isStartParaOrCell(qName, attributes)) {
+						ParagraphFrame pf = push(new ParagraphFrame());
+					} else if (isStartList(qName, attributes)) {
+						//
+					} else if (isStartRow(qName, attributes)) {
+						if (top instanceof TableFrame) {
+							((TableFrame)top).newRow();
+						} else {
+							throw new UnsupportedOperationException();
+						}
+					} else if (isStartMessage(qName, attributes)) {
+						push(new MessageFrame());
+					}
+				}
+
+				private boolean isStartMessage(String qName, Attributes attributes) {
+					return "messageML".equals(qName) || ("div".equals(qName)  && "PresentationML".equals(attributes.getValue("data-format")));
+				}
+
+				private boolean isStartList(String qName, Attributes attributes) {
+					return "ul".equals(qName) || "ol".equals(qName);
+				}
+
+				private boolean isStartRow(String qName, Attributes attributes) {
+					return "tr".equals(qName);
+				}
+
+				private <X extends Frame<?>> X push(X newFrame) {
+					newFrame.parent = top;
+					top = newFrame;
+					return newFrame;
+				}
+
+				private boolean isStartTable(String qName, Attributes attributes) {
+					return "table".equals(qName);
+				}
+
+				private boolean isStartTag(String qName, Attributes attributes) {
+					return "span".equals(qName) && attributes.getValue("class").contains("entity");
+				}
+				
+				private boolean isStartParaOrCell(String qName, Attributes attributes) {
+					return "p".equals(qName) || "td".equals(qName) || "li".equals(qName) || "th".equals(qName);
+				}
+				
+				@Override
+				public void endElement(String uri, String localName, String qName) throws SAXException {
+					if (top.isEnding(qName)) {
+						Frame<?> parent = top.parent;
+						Content c = top.getContents();
+						if (parent == null) {
+							out[0] = c;
+						} else {
+							top = parent;
+							top.push(c);
+						}
+					}
+				}
+
+				@Override
+				public void characters(char[] ch, int start, int length) throws SAXException {
+					if (top instanceof TextFrame) {
+						((TextFrame) top).push(ch, start, length);
+					} else {
+						throw new UnsupportedOperationException("Wasn't expecting text");
+					}
+				}
+				
+			});
+		
+		
+		return (Message) out[0];
+	}
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/room/SymphonyRooms.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/room/SymphonyRooms.java
new file mode 100644
index 000000000..3298a5593
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/room/SymphonyRooms.java
@@ -0,0 +1,22 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.room;
+
+import com.github.deutschebank.symphony.workflow.content.Addressable;
+import com.github.deutschebank.symphony.workflow.content.Room;
+import com.github.deutschebank.symphony.workflow.content.User;
+import com.github.deutschebank.symphony.workflow.room.Rooms;
+
+/**
+ * Increases the 
+ * @author Rob Moffat
+ *
+ */
+public interface SymphonyRooms extends Rooms {
+
+	public User loadUserById(Long userId);
+	
+	public Room loadRoomById(String streamId);
+	
+	public String getStreamFor(Addressable a);
+	
+	public Long getId(User u);
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/room/SymphonyRoomsImpl.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/room/SymphonyRoomsImpl.java
new file mode 100644
index 000000000..8efc9bd00
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/sources/symphony/room/SymphonyRoomsImpl.java
@@ -0,0 +1,137 @@
+package com.github.deutschebank.symphony.workflow.sources.symphony.room;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.github.deutschebank.symphony.workflow.AbstractNeedsWorkflow;
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.content.Addressable;
+import com.github.deutschebank.symphony.workflow.content.Room;
+import com.github.deutschebank.symphony.workflow.content.RoomDef;
+import com.github.deutschebank.symphony.workflow.content.User;
+import com.github.deutschebank.symphony.workflow.content.UserDef;
+import com.symphony.api.model.StreamAttributes;
+import com.symphony.api.model.StreamFilter;
+import com.symphony.api.model.StreamList;
+import com.symphony.api.model.StreamType;
+import com.symphony.api.model.StreamType.TypeEnum;
+import com.symphony.api.model.UserId;
+import com.symphony.api.model.UserV2;
+import com.symphony.api.model.V3RoomAttributes;
+import com.symphony.api.model.V3RoomDetail;
+import com.symphony.api.pod.RoomMembershipApi;
+import com.symphony.api.pod.StreamsApi;
+import com.symphony.api.pod.UsersApi;
+
+/**
+ * Basic implementation of symphony rooms with no caching.
+ * @author Rob Moffat
+ *
+ */
+public class SymphonyRoomsImpl extends AbstractNeedsWorkflow implements SymphonyRooms {
+	
+	private RoomMembershipApi rmApi;
+	private StreamsApi streamsApi;
+	private UsersApi usersApi;
+	private List<Long> adminUserIds = Collections.emptyList();
+	
+	public SymphonyRoomsImpl(Workflow wf, RoomMembershipApi rmApi, StreamsApi streamsApi, UsersApi usersApi) {
+		super(wf);
+		wf.registerRoomsProvider(this);
+		this.rmApi = rmApi;
+		this.streamsApi = streamsApi;
+		this.usersApi = usersApi;
+		this.adminUserIds = wf.getAdministrators().stream()
+				.map(u -> getId(u))
+				.collect(Collectors.toList());
+	}
+	
+	@Override
+	public Set<Room> getAllRooms() {
+		StreamType st = new StreamType().type(TypeEnum.ROOM);
+		StreamList list = streamsApi.v1StreamsListPost(null, new StreamFilter().streamTypes(Collections.singletonList(st)), 0, 0);
+		Set<Room> out = new HashSet<>();
+		for (StreamAttributes streamAttributes : list) {
+			Room r = loadRoomById(streamAttributes.getId());
+			out.add(r);
+		}
+		
+		return out;
+	}
+
+	@Override
+	public User loadUserById(Long userId) {
+		UserV2 user = usersApi.v2UserGet(null, userId, null, null, true);
+		return new UserDef(userId.toString(), user.getDisplayName(),user.getEmailAddress());
+	}
+
+	@Override
+	public Room loadRoomById(String streamId) {
+		V3RoomDetail r = streamsApi.v3RoomIdInfoGet(streamId, null);
+		return new RoomDef(r.getRoomAttributes().getName(), r.getRoomAttributes().getDescription(), r.getRoomAttributes().isPublic(), streamId);
+	}
+
+	@Override
+	public String getStreamFor(Addressable a) {
+		if (a instanceof User) {
+			return streamsApi.v1ImCreatePost(Collections.singletonList(getId((User) a)), null).getId();
+		} else if (a instanceof Room) {
+			StreamType st = new StreamType().type(TypeEnum.ROOM);
+			StreamList list = streamsApi.v1StreamsListPost(null, new StreamFilter().streamTypes(Collections.singletonList(st)), 0, 0);
+			Map<Room, String> out = new HashMap<>();
+			for (StreamAttributes streamAttributes : list) {
+				if (streamAttributes.getRoomAttributes().getName().equals(((Room) a).getRoomName())) {
+					return streamAttributes.getId();
+				}
+			}
+			
+			// ok, need to create the room
+			return ensureRoom((Room) a).getId();
+		} else {
+			throw new UnsupportedOperationException("What is this? "+a);
+		}
+	}
+	
+	public Room ensureRoom(Room r) {
+		// create the room
+		V3RoomAttributes ra = new V3RoomAttributes()
+			.name(r.getRoomName())
+			.description(r.getRoomDescription())
+			._public(r.isPub())
+			.discoverable(r.isPub());
+		V3RoomDetail detail = streamsApi.v3RoomCreatePost(ra, null);
+		
+		// next, we need to make sure that all of the admins are members of the room and owners.
+		for (Long user : adminUserIds) {
+			UserId u = new UserId().id(user);
+			rmApi.v1RoomIdMembershipAddPost(u, null, detail.getRoomSystemInfo().getId());
+			rmApi.v1RoomIdMembershipPromoteOwnerPost(u, null, detail.getRoomSystemInfo().getId());
+		}
+		
+		return new RoomDef(
+				detail.getRoomAttributes().getName(), 
+				detail.getRoomAttributes().getDescription(),
+				detail.getRoomAttributes().isPublic(),
+				detail.getRoomSystemInfo().getId());
+	}
+
+	@Override
+	public Long getId(User u) {
+		if (u == null) {
+			return null;
+		} else if (u.getId() != null) {
+			return Long.parseLong(u.getId());
+		} else {
+			UserV2 user = usersApi.v2UserGet(null, null, u.getAddress(), null, true);
+			return user.getId();
+		}
+	}
+
+
+
+}
diff --git a/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/validation/ErrorHelp.java b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/validation/ErrorHelp.java
new file mode 100644
index 000000000..4157792f7
--- /dev/null
+++ b/chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/validation/ErrorHelp.java
@@ -0,0 +1,41 @@
+package com.github.deutschebank.symphony.workflow.validation;
+
+import java.util.HashMap;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.Errors;
+import org.springframework.validation.MapBindingResult;
+import org.springframework.validation.Validator;
+
+
+@Component
+public class ErrorHelp {
+
+	public static Errors createErrorHolder() {
+		return new MapBindingResult(new HashMap<>(), "");
+	}
+
+	public static String errors(Errors e) {
+		return e.getFieldErrors(null).stream()
+			.map(m -> {
+				return "<span class=\"tempo-text-color--red\">"+m.getDefaultMessage()+"</span>";
+			})
+			.reduce("", String::concat);
+	}
+
+	@Autowired
+	Validator validator;
+
+	public Errors performErrorHandling(Object currentForm) {
+		if (currentForm == null) {
+			return null;
+		}
+		
+		Errors errors = ErrorHelp.createErrorHolder();
+		validator.validate(currentForm, errors);
+		return errors;
+	}
+		
+
+}
diff --git a/chat-workflow/src/main/resources/META-INF/spring.factories b/chat-workflow/src/main/resources/META-INF/spring.factories
new file mode 100644
index 000000000..fd9583584
--- /dev/null
+++ b/chat-workflow/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,3 @@
+# Auto Configure
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+ com.github.deutschebank.symphony.workflow.sources.symphony.SymphonyWorkflowConfig,com.github.deutschebank.symphony.workflow.sources.symphony.SymphonyWorkflowComponentsConfig,com.github.deutschebank.symphony.workflow.sources.symphony.handlers.jersey.JerseyAttachmentHandlerConfig
\ No newline at end of file
diff --git a/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/AbstractMockSymphonyTest.java b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/AbstractMockSymphonyTest.java
new file mode 100644
index 000000000..5be930eaf
--- /dev/null
+++ b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/AbstractMockSymphonyTest.java
@@ -0,0 +1,80 @@
+package com.github.deutschebank.symphony.workflow;
+
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
+
+import com.github.deutschebank.symphony.spring.api.SymphonyApiConfig;
+import com.github.deutschebank.symphony.workflow.fixture.TestWorkflowConfig;
+import com.github.deutschebank.symphony.workflow.sources.symphony.SymphonyBot;
+import com.github.deutschebank.symphony.workflow.sources.symphony.SymphonyWorkflowComponentsConfig;
+import com.github.deutschebank.symphony.workflow.sources.symphony.SymphonyWorkflowConfig;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.jersey.JerseyAttachmentHandlerConfig;
+import com.symphony.api.agent.DatafeedApi;
+import com.symphony.api.agent.MessagesApi;
+import com.symphony.api.id.SymphonyIdentity;
+import com.symphony.api.model.User;
+import com.symphony.api.pod.RoomMembershipApi;
+import com.symphony.api.pod.StreamsApi;
+import com.symphony.api.pod.UsersApi;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = { 
+		TestWorkflowConfig.class, 
+		SymphonyWorkflowConfig.class,
+		AbstractMockSymphonyTest.MockConfiguration.class, 
+		SymphonyWorkflowComponentsConfig.class,
+		JerseyAttachmentHandlerConfig.class })
+public abstract class AbstractMockSymphonyTest {
+
+	private static final String BOT_EMAIL = "dummybot@example.com";
+	
+	@MockBean
+	MessagesApi messagesApi;
+	
+	@MockBean
+	DatafeedApi datafeedApi;
+	
+	@MockBean
+	RoomMembershipApi rmApi;
+	
+	@MockBean
+	StreamsApi streamsApi;
+	
+	/**
+	 * This is here, otherwise we start the real symphony bot talking to mock endpoints, which 
+	 * wouldn't work.
+	 */
+	@MockBean
+	SymphonyBot symphonyBot;
+	
+	@Configuration
+	public static class MockConfiguration {
+	
+		@Bean(name=SymphonyApiConfig.BOT_IDENTITY)
+		public SymphonyIdentity symphonyIdentity() {
+			SymphonyIdentity botIdentity = Mockito.mock(SymphonyIdentity.class);
+			Mockito.when(botIdentity.getEmail()).then((i) -> BOT_EMAIL);
+			return botIdentity;
+		}
+		
+		@Bean
+		public UsersApi usersApi() {
+			UsersApi usersApi = Mockito.mock(UsersApi.class);
+			Mockito.when(usersApi.v1UserGet(Mockito.eq(BOT_EMAIL), Mockito.isNull(), Mockito.anyBoolean())).thenReturn(new User().emailAddress(BOT_EMAIL).id(111l));
+			return usersApi;
+		}
+		
+		@Bean
+		public LocalValidatorFactoryBean localValidatorFactoryBean() {
+			return new LocalValidatorFactoryBean();
+		}
+		
+
+	}
+}
diff --git a/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestEntityJsonConversion.java b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestEntityJsonConversion.java
new file mode 100644
index 000000000..6e876986a
--- /dev/null
+++ b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestEntityJsonConversion.java
@@ -0,0 +1,79 @@
+package com.github.deutschebank.symphony.workflow;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.deutschebank.symphony.workflow.content.RoomDef;
+import com.github.deutschebank.symphony.workflow.content.UserDef;
+import com.github.deutschebank.symphony.workflow.fixture.TestOb3;
+import com.github.deutschebank.symphony.workflow.fixture.TestObject;
+import com.github.deutschebank.symphony.workflow.fixture.TestObjects;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.EntityJsonConverter;
+
+public class TestEntityJsonConversion extends AbstractMockSymphonyTest {
+
+	@Autowired
+	EntityJsonConverter converter;
+		
+	ObjectMapper om = new ObjectMapper();
+
+	@Test
+	public void testObject() throws Exception {
+
+		TestObject a = new TestObject("83274239874", true, true, "rob@example.com", 234786, 2138);
+
+		// can we convert to messageML? (something populated)
+		String out = converter.toWorkflowJson(a);
+	
+		compare(out, "{\"workflow_001\":{\"type\":\"com.github.deutschebank.symphony.workflow.fixture.testObject\",\"version\":\"1.0\",\"isin\":\"83274239874\",\"bidAxed\":true,\"askAxed\":true,\"creator\":\"rob@example.com\",\"bidQty\":234786,\"askQty\":2138}}");
+		
+		TestObject b = (TestObject) converter.readWorkflowValue(out);
+		Assert.assertEquals(a, b);
+	}
+
+	private void compare(String out, String expected) throws JsonProcessingException, JsonMappingException {
+		System.out.println("expected: "+expected);
+		System.out.println("actual  : "+out);
+		
+		JsonNode joOut = om.readTree(out);
+		JsonNode joExpected = om.readTree(expected);
+
+		Assert.assertEquals(joOut, joExpected);
+	}
+
+	@Test
+	public void testObjects() throws Exception {
+
+		TestObject a1 = new TestObject("83274239874", true, true, "rob@example.com", 234786, 2138);
+		TestObject a2 = new TestObject("AUD274239874", true, false, "gregb@example.com", 2386, new BigDecimal("234823498.573"));
+
+		TestObjects a = new TestObjects(Arrays.asList(a1, a2));
+
+		String out = converter.toWorkflowJson(a);
+		compare("{\"workflow_001\":{\"type\":\"com.github.deutschebank.symphony.workflow.fixture.testObjects\",\"version\":\"1.0\",\"items\":[{\"type\":\"com.github.deutschebank.symphony.workflow.fixture.testObject\",\"version\":\"1.0\",\"isin\":\"83274239874\",\"bidAxed\":true,\"askAxed\":true,\"creator\":\"rob@example.com\",\"bidQty\":234786,\"askQty\":2138},{\"type\":\"com.github.deutschebank.symphony.workflow.fixture.testObject\",\"version\":\"1.0\",\"isin\":\"AUD274239874\",\"bidAxed\":true,\"askAxed\":false,\"creator\":\"gregb@example.com\",\"bidQty\":2386,\"askQty\":234823498.573}]}}",
+				out);
+
+		TestObjects b = (TestObjects) converter.readWorkflowValue(out);
+		Assert.assertEquals(a, b);
+	}
+
+	@Test
+	public void testOb3() throws Exception {
+
+		TestOb3 a1 = new TestOb3(new RoomDef("abc", "123", true, null), new UserDef(null, "Robert Moffat", "rbo@kjite9.com"), "SOme message");
+		String out = converter.toWorkflowJson(a1);
+
+		compare(out, "{\"workflow_001\":{\"type\":\"com.github.deutschebank.symphony.workflow.fixture.testOb3\",\"version\":\"1.0\",\"r\":{\"type\":\"com.github.deutschebank.symphony.workflow.content.roomDef\",\"version\":\"1.0\",\"roomName\":\"abc\",\"roomDescription\":\"123\",\"pub\":true,\"id\":null},\"u\":{\"type\":\"com.github.deutschebank.symphony.workflow.content.userDef\",\"version\":\"1.0\",\"name\":\"Robert Moffat\",\"id\":null,\"tagType\":\"USER\",\"address\":\"rbo@kjite9.com\"},\"someText\":\"SOme message\"}}");
+
+		TestOb3 b = (TestOb3) converter.readWorkflowValue(out);
+		Assert.assertEquals(a1, b);
+	}
+}
diff --git a/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestFormConverter.java b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestFormConverter.java
new file mode 100644
index 000000000..01f81637f
--- /dev/null
+++ b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestFormConverter.java
@@ -0,0 +1,67 @@
+package com.github.deutschebank.symphony.workflow;
+
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.deutschebank.symphony.workflow.content.Author;
+import com.github.deutschebank.symphony.workflow.content.UserDef;
+import com.github.deutschebank.symphony.workflow.fixture.TestOb4;
+import com.github.deutschebank.symphony.workflow.fixture.TestObject;
+import com.github.deutschebank.symphony.workflow.fixture.TestObjects;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.FormConverter;
+import com.github.deutschebank.symphony.workflow.sources.symphony.room.SymphonyRooms;
+
+public class TestFormConverter extends AbstractMockSymphonyTest{
+	
+	@MockBean
+	SymphonyRooms rooms;
+	
+	private FormConverter fc;
+	private ObjectMapper om = new ObjectMapper();
+
+	@Test
+	public void testSimpleForm() throws Exception {
+		Object o = om.readValue("{\"action\":\"add+0\",\"isin.\":\"fd3442\",\"bidAxed.\":\"true\",\"askAxed.\":\"true\",\"creator.\":\"tr\",\"bidQty.\":\"32432\",\"askQty.\":\"234\"}", Map.class);
+		TestObject to = (TestObject) fc.convert((Map<String, Object>) o, TestObject.class.getCanonicalName());
+		Assert.assertEquals("fd3442", to.getIsin());
+		Assert.assertEquals("tr", to.getCreator());
+		Assert.assertEquals(32432, to.getBidQty());
+		
+	}
+	
+	@Test
+	public void testFormContainingList() throws Exception {
+		Object o = om.readValue("{\"action\":\"add+0\",\"items.[0].isin.\":\"fd3442\",\"items.[0].bidAxed.\":\"true\",\"items.[0].askAxed.\":\"true\",\"items.[0].creator.\":\"tr\",\"items.[0].bidQty.\":\"32432\",\"items.[0].askQty.\":\"234\"}", Map.class);
+		TestObjects to = (TestObjects) fc.convert((Map<String, Object>) o, TestObjects.class.getCanonicalName());
+		Assert.assertEquals("fd3442", to.getItems().get(0).getIsin());
+		Assert.assertEquals("tr", to.getItems().get(0).getCreator());
+		Assert.assertEquals(32432, to.getItems().get(0).getBidQty());
+	}
+	
+	@Test
+	public void testUsersAndAuthors() throws Exception {
+		before();
+		Object o = om.readValue("{\"action\": \"ob4+0\", \"c.\": \"B\", \"b.\": true, \"someUser.\": [345315370602462]}", Map.class);
+		Author.CURRENT_AUTHOR.set(new UserDef("123", "johnny bignose", "jb@nose.com"));
+		TestOb4 to = (TestOb4) fc.convert((Map<String, Object>) o, TestOb4.class.getCanonicalName());
+		Assert.assertEquals(Author.CURRENT_AUTHOR.get(), to.getA());
+		Assert.assertTrue(to.isB());
+		Assert.assertEquals("345315370602462", to.getSomeUser().getId());
+		Assert.assertEquals(TestOb4.Choice.B, to.getC());
+		
+		
+	}
+
+	@Before
+	public void before() {
+		Mockito.when(rooms.loadUserById(Mockito.eq(345315370602462l))).thenReturn(new UserDef("345315370602462", "Some Guy", "sg@example.com"));
+		fc = new FormConverter(rooms);
+	}
+	
+}
diff --git a/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestFormMessageML.java b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestFormMessageML.java
new file mode 100644
index 000000000..ae223cf02
--- /dev/null
+++ b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestFormMessageML.java
@@ -0,0 +1,148 @@
+package com.github.deutschebank.symphony.workflow;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.UUID;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.Errors;
+import org.springframework.validation.Validator;
+
+import com.github.deutschebank.symphony.workflow.content.Author;
+import com.github.deutschebank.symphony.workflow.content.ID;
+import com.github.deutschebank.symphony.workflow.content.UserDef;
+import com.github.deutschebank.symphony.workflow.fixture.TestOb4;
+import com.github.deutschebank.symphony.workflow.fixture.TestObject;
+import com.github.deutschebank.symphony.workflow.fixture.TestObjects;
+import com.github.deutschebank.symphony.workflow.fixture.TestOb4.Choice;
+import com.github.deutschebank.symphony.workflow.form.Button;
+import com.github.deutschebank.symphony.workflow.form.Button.Type;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.FormMessageMLConverter;
+import com.github.deutschebank.symphony.workflow.validation.ErrorHelp;
+
+public class TestFormMessageML extends AbstractMockSymphonyTest {
+
+	@Autowired
+	FormMessageMLConverter messageMlConverter;
+	
+	@Autowired
+	Validator validator;
+
+
+	@Test
+	public void testNewWeirdFieldsEdit() throws Exception {
+		TestOb4 to4 = new TestOb4();
+		to4.setTheId(new ID(UUID.fromString("adf360dd-06fe-43a4-9a62-2c17fe2deefa")));
+		Button submit = new Button("submit", Type.ACTION, "GO");
+		String actual = messageMlConverter.convert(TestOb4.class, to4, Collections.singletonList(submit), true, ErrorHelp.createErrorHolder());
+		System.out.println("<messageML>" + actual + "</messageML>");
+		Assert.assertEquals("<form id=\"com.github.deutschebank.symphony.workflow.fixture.TestOb4\" ><hash tag=\"adf360dd-06fe-43a4-9a62-2c17fe2deefa\" /> <select name=\"c.\" required=\"false\" data-placeholder=\"Choose c\" ><option value=\"A\" >A</option><option value=\"B\" >B</option><option value=\"C\" >C</option></select><checkbox name=\"b.\" checked=\"false\" value=\"true\" >b</checkbox><person-selector name=\"someUser.\" placeholder=\"Search for someone\" required=\"false\"/><p><button name=\"submit\" type=\"action\" >GO</button></p></form>", actual); 
+		
+	}
+	
+	
+	@Test
+	public void testNewWeirdFieldsView() throws Exception {
+		Author.CURRENT_AUTHOR.set(new UserDef("sdfjk", "bbb", "v@bkfjd.com"));
+		TestOb4 to4 = new TestOb4();
+		to4.setB(true);
+		to4.setC(Choice.B);
+		to4.setSomeUser(new UserDef("2678", "bob", "bob@example.com"));
+		to4.setTheId(new ID(UUID.fromString("adf360dd-06fe-43a4-9a62-2c17fe2deefa")));
+		Button submit = new Button("submit", Type.ACTION, "GO");
+		String actual = messageMlConverter.convert(TestOb4.class, to4, Collections.singletonList(submit), false, ErrorHelp.createErrorHolder());
+		System.out.println("<messageML>" + actual + "</messageML>");
+		Assert.assertEquals("<table><tr><td><b>theId:</b></td><td><hash tag=\"adf360dd-06fe-43a4-9a62-2c17fe2deefa\" /> </td></tr><tr><td><b>c:</b></td><td>B</td></tr><tr><td><b>b:</b></td><td>Y</td></tr><tr><td><b>a:</b></td><td><mention uid=\"sdfjk\" /></td></tr><tr><td><b>someUser:</b></td><td><mention uid=\"2678\" /></td></tr></table><form id=\"com.github.deutschebank.symphony.workflow.fixture.TestOb4\" ><p><button name=\"submit\" type=\"action\" >GO</button></p></form>", actual);
+		
+	}	
+	@Test
+	public void testAxeFormEditMessageML() throws Exception {
+
+		TestObject a = new TestObject("83274239874", true, true, "rob@example.com", 234786, 2138);
+		Button submit = new Button("submit", Type.ACTION, "GO");
+
+		// can we convert to messageML? (something populated)
+		String out = messageMlConverter.convert(TestObject.class, a, Collections.singletonList(submit), true,
+				ErrorHelp.createErrorHolder());
+		System.out.println("<messageML>" + out + "</messageML>");
+		Assert.assertEquals(
+				"<form id=\"com.github.deutschebank.symphony.workflow.fixture.TestObject\" ><text-field name=\"isin.\" placeholder=\"isin\" >83274239874</text-field><checkbox name=\"bidAxed.\" checked=\"true\" value=\"true\" >bidAxed</checkbox><checkbox name=\"askAxed.\" checked=\"true\" value=\"true\" >askAxed</checkbox><text-field name=\"creator.\" placeholder=\"creator\" >rob@example.com</text-field><text-field name=\"bidQty.\" placeholder=\"bidQty\" >234786</text-field><text-field name=\"askQty.\" placeholder=\"askQty\" >2138</text-field><p><button name=\"submit\" type=\"action\" >GO</button></p></form>",
+				out);
+
+		// new form
+		out = messageMlConverter.convert(TestObject.class, null, Collections.singletonList(submit), true,
+				ErrorHelp.createErrorHolder());
+		System.out.println("<messageML>" + out + "</messageML>");
+		Assert.assertEquals(
+				"<form id=\"com.github.deutschebank.symphony.workflow.fixture.TestObject\" ><text-field name=\"isin.\" placeholder=\"isin\" ></text-field><checkbox name=\"bidAxed.\" value=\"true\" >bidAxed</checkbox><checkbox name=\"askAxed.\" value=\"true\" >askAxed</checkbox><text-field name=\"creator.\" placeholder=\"creator\" ></text-field><text-field name=\"bidQty.\" placeholder=\"bidQty\" ></text-field><text-field name=\"askQty.\" placeholder=\"askQty\" ></text-field><p><button name=\"submit\" type=\"action\" >GO</button></p></form>",
+				out);
+
+	}
+
+	@Test
+	public void testAxeFormViewMessageML() throws Exception {
+
+		TestObject a = new TestObject("83274239874", true, true, "rob@example.com", 234786, 2138);
+		Button submit = new Button("submit", Type.ACTION, "GO");
+
+		// can we convert to messageML? (something populated)
+		String out = messageMlConverter.convert(TestObject.class, a, Collections.singletonList(submit), false,
+				ErrorHelp.createErrorHolder());
+		System.out.println("<messageML>" + out + "</messageML>");
+		Assert.assertEquals("<table><tr><td><b>isin:</b></td><td>83274239874</td></tr><tr><td><b>bidAxed:</b></td><td>Y</td></tr><tr><td><b>askAxed:</b></td><td>Y</td></tr><tr><td><b>creator:</b></td><td>rob@example.com</td></tr><tr><td><b>bidQty:</b></td><td>234786</td></tr><tr><td><b>askQty:</b></td><td>2138</td></tr></table><form id=\"com.github.deutschebank.symphony.workflow.fixture.TestObject\" ><p><button name=\"submit\" type=\"action\" >GO</button></p></form>", out);
+							
+	}
+
+	@Test
+	public void testAxesTableEditMessageML() throws Exception {
+
+		TestObject a1 = new TestObject("83274239874", true, true, "rob@example.com", 234786, 2138);
+		TestObject a2 = new TestObject("AUD274239874", true, false, "gregb@example.com", 2386, new BigDecimal("234823498.573"));
+
+		TestObjects a = new TestObjects(Arrays.asList(a1, a2));
+
+		Button submit = new Button("submit", Type.ACTION, "GO");
+
+		// can we convert to messageML? (something populated)
+		String out = messageMlConverter.convert(TestObjects.class, a, Collections.singletonList(submit), true,
+				ErrorHelp.createErrorHolder());
+		System.out.println("<messageML>" + out + "</messageML>");
+		Assert.assertEquals("<form id=\"com.github.deutschebank.symphony.workflow.fixture.TestObjects\" ><table><thead><tr><td ><b>isin</b></td><td style=\"text-align:center;\" ><b>bidAxed</b></td><td style=\"text-align:center;\" ><b>askAxed</b></td><td ><b>creator</b></td><td style=\"text-align: right;\"><b>bidQty</b></td><td style=\"text-align: right;\"><b>askQty</b></td><td style=\"text-align:center;\" ><button name=\"items.table-delete-rows\">Delete</button></td><td style=\"text-align:center;\" ><button name=\"items.table-add-row\">New</button></td></tr></thead><tbody><tr><td >83274239874</td><td style=\"text-align:center;\" >Y</td><td style=\"text-align:center;\" >Y</td><td >rob@example.com</td><td style=\"text-align: right;\">234786</td><td style=\"text-align: right;\">2138</td><td style=\"text-align:center;\" ><checkbox name=\"items.[0].selected\" /></td><td style=\"text-align:center;\" ><button name=\"items.[0].table-edit-row\">Edit</button></td></tr><tr><td >AUD274239874</td><td style=\"text-align:center;\" >Y</td><td style=\"text-align:center;\" >N</td><td >gregb@example.com</td><td style=\"text-align: right;\">2386</td><td style=\"text-align: right;\">234823498.573</td><td style=\"text-align:center;\" ><checkbox name=\"items.[1].selected\" /></td><td style=\"text-align:center;\" ><button name=\"items.[1].table-edit-row\">Edit</button></td></tr></tbody></table><p><button name=\"submit\" type=\"action\" >GO</button></p></form>", out);
+	}
+
+	@Test
+	public void testAxesTableViewMessageML() throws Exception {
+
+		TestObject a1 = new TestObject("83274239874", true, true, "rob@example.com", 234786, 2138);
+		TestObject a2 = new TestObject("AUD274239874", true, false, "gregb@example.com", 2386, new BigDecimal("234823498.573"));
+
+		TestObjects a = new TestObjects(Arrays.asList(a1, a2));
+
+		Button submit = new Button("submit", Type.ACTION, "GO");
+
+		// can we convert to messageML? (something populated)
+		String out = messageMlConverter.convert(TestObjects.class, a, Collections.singletonList(submit), false,
+				ErrorHelp.createErrorHolder());
+		System.out.println("<messageML>" + out + "</messageML>");
+		Assert.assertTrue(out.startsWith("<table><tr><td><b>items:</b></td><td><table><thead><tr><td ><b>isin</b></td><td style=\"text-align:center;\" ><b>bidAxed</b></td><td style=\"text-align:center;\" ><b>askAxed</b></td><td ><b>creator</b></td><td style=\"text-align: right;\"><b>bidQty</b></td><td style=\"text-align: right;\"><b>askQty</b></td></tr></thead><tbody><tr><td >83274239874</td><td style=\"text-align:center;\" >Y</td><td style=\"text-align:center;\" >Y</td><td >rob@example.com</td><td style=\"text-align: right;\">234786</td><td style=\"text-align: right;\">2138</td></tr><tr><td >AUD274239874</td><td style=\"text-align:center;\" >Y</td><td style=\"text-align:center;\" >N</td><td >gregb@example.com</td><td style=\"text-align: right;\">2386</td><td style=\"text-align: right;\">234823498.573</td></tr></tbody></table></td></tr></table><form id=\"com.github.deutschebank.symphony.workflow.fixture.TestObjects\" ><p><button name=\"submit\" type=\"action\" >GO</button></p></form>"));
+
+	}
+	
+	@Test
+	public void testValidation() throws Exception {
+		TestObject a = new TestObject("83274239874", true, true, "rob", 234786, 2138);
+		Button submit = new Button("submit", Type.ACTION, "GO");
+
+		// can we convert to messageML? (something populated)
+		Errors eh = ErrorHelp.createErrorHolder();
+		validator.validate(a, eh);
+		
+		String out = messageMlConverter.convert(TestObject.class, a, Collections.singletonList(submit), true, eh);
+		System.out.println("<messageML>" + out + "</messageML>");
+		Assert.assertTrue(out.startsWith("<form id=\"com.github.deutschebank.symphony.workflow.fixture.TestObject\" ><span class=\"tempo-text-color--red\">size must be between 12 and 2147483647</span><text-field name=\"isin.\" placeholder=\"isin\" >83274239874</text-field"));
+		Assert.assertTrue(out.contains("<span class=\"tempo-text-color--red\">must be a well-formed email address</span><text-field name=\"creator.\" placeholder=\"creator\" >rob</text-field>"));
+	}
+}
diff --git a/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestHistory.java b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestHistory.java
new file mode 100644
index 000000000..3985637a8
--- /dev/null
+++ b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestHistory.java
@@ -0,0 +1,19 @@
+package com.github.deutschebank.symphony.workflow;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+@Ignore("need to write these tests based on coverage. Also worth thinking about ids first")
+public class TestHistory {
+
+	@Test
+	public void testGetLast() {
+		Assert.fail();
+	}
+	
+	@Test
+	public void testFindInHistory() {
+		Assert.fail();
+	}
+}
diff --git a/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestRoomAndUsersBuilder.java b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestRoomAndUsersBuilder.java
new file mode 100644
index 000000000..43a3d146a
--- /dev/null
+++ b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestRoomAndUsersBuilder.java
@@ -0,0 +1,97 @@
+package com.github.deutschebank.symphony.workflow;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Mockito.when;
+
+import java.util.Collections;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.content.Room;
+import com.github.deutschebank.symphony.workflow.content.RoomDef;
+import com.github.deutschebank.symphony.workflow.fixture.TestWorkflowConfig;
+import com.github.deutschebank.symphony.workflow.room.Rooms;
+import com.github.deutschebank.symphony.workflow.sources.symphony.room.SymphonyRoomsImpl;
+import com.symphony.api.model.RoomSystemInfo;
+import com.symphony.api.model.StreamAttributes;
+import com.symphony.api.model.StreamList;
+import com.symphony.api.model.UserV2;
+import com.symphony.api.model.V2RoomAttributes;
+import com.symphony.api.model.V2RoomDetail;
+import com.symphony.api.model.V2UserList;
+import com.symphony.api.model.V3RoomAttributes;
+import com.symphony.api.model.V3RoomDetail;
+import com.symphony.api.pod.RoomMembershipApi;
+import com.symphony.api.pod.StreamsApi;
+import com.symphony.api.pod.UsersApi;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = {  TestWorkflowConfig.class })
+public class TestRoomAndUsersBuilder {
+	
+	Rooms ruBuilder;
+	
+	@MockBean
+	RoomMembershipApi rmApi;
+	
+	@MockBean
+	StreamsApi streamsApi;
+	
+	@MockBean
+	UsersApi usersApi;
+	
+	@Autowired
+	Workflow wf;
+	
+	@Before
+	public void setup() {
+		
+		// just returns a single real user
+		when(usersApi.v3UsersGet(any(), any(), any(), any(), any()))
+			.then(a -> new V2UserList().users(Collections.singletonList(new UserV2().id(45l).displayName("Robert Moffat").emailAddress("rob@kite9.com"))));
+		
+		when(usersApi.v2UserGet(any(), any(), any(), any(), any()))
+		.then(a -> new UserV2().id(45l).displayName("Robert Moffat").emailAddress("rob@kite9.com"));
+	
+		
+		// one room
+		when(streamsApi.v1StreamsListPost(any(), any(), any(), any()))
+			.then(a -> {
+				StreamList out = new StreamList();
+				out.add(new StreamAttributes().id("123"));
+				return out;
+			});
+		
+		when(streamsApi.v2RoomIdInfoGet(eq("123"), any()))
+			.then(a -> new V2RoomDetail().roomAttributes(new V2RoomAttributes()._public(true).name("Initial Room").description("Bogus")));
+		
+		when(streamsApi.v3RoomCreatePost(any(), isNull()))
+			.then(a -> new V3RoomDetail()
+					.roomSystemInfo(new RoomSystemInfo().id("456"))
+					.roomAttributes(new V3RoomAttributes()._public(false).name("Some Test Room").description("Still Bogus")));
+		
+		when(streamsApi.v3RoomIdInfoGet(any(), any()))
+			.then(a -> new V3RoomDetail().roomAttributes(new V3RoomAttributes().name("Some Room").description("Bogus Room")._public(true)));
+		
+		ruBuilder = new SymphonyRoomsImpl(wf, rmApi, streamsApi, usersApi);
+		
+	}
+	
+	@Test
+	public void testCreateRoom() {
+		RoomDef rd = new RoomDef("Some Test Room", "Automated Test Room Created", true, null);
+		Room out = ruBuilder.ensureRoom(rd);
+		assertEquals("Some Test Room", out.getRoomName());
+		assertEquals(1, ruBuilder.getAllRooms().size());
+	}
+}
diff --git a/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestSimpleMessageParser.java b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestSimpleMessageParser.java
new file mode 100644
index 000000000..b1473997c
--- /dev/null
+++ b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestSimpleMessageParser.java
@@ -0,0 +1,71 @@
+package com.github.deutschebank.symphony.workflow;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.stream.Collectors;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.github.detuschebank.symphony.json.EntityJson;
+import com.github.deutschebank.symphony.workflow.content.Content;
+import com.github.deutschebank.symphony.workflow.content.Message;
+import com.github.deutschebank.symphony.workflow.content.Paragraph;
+import com.github.deutschebank.symphony.workflow.content.PastedTable;
+import com.github.deutschebank.symphony.workflow.content.UserDef;
+import com.github.deutschebank.symphony.workflow.content.Word;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.EntityJsonConverter;
+import com.github.deutschebank.symphony.workflow.sources.symphony.messages.SimpleMessageParser;
+
+public class TestSimpleMessageParser extends AbstractMockSymphonyTest {
+
+	SimpleMessageParser smp = new SimpleMessageParser();
+	
+	@Autowired
+	EntityJsonConverter entityJsonConverter;
+		
+	@Test
+	public void testMessageWithTable() throws Exception {
+		Content c = smp.parseMessage(
+				"<div data-format=\"PresentationML\" data-version=\"2.0\" class=\"wysiwyg\"><p><table class=\"pasted-table\"><thead><tr><th>Name</th><th>Age</th><th>Alive</th></tr></thead><tbody><tr><td>Jim</td><td>5</td><td>FALSE</td></tr><tr><td>James</td><td>7</td><td>TRUE</td></tr></tbody></table></p></div>",
+				new EntityJson());
+		
+		Assert.assertEquals(Paragraph.of(Arrays.asList(Word.of("Age"))), c.getNth(PastedTable.class, 0).get().getColumnNames().get(1));
+
+		Assert.assertEquals(Paragraph.of(Arrays.asList(Word.of("TRUE"))), c.getNth(PastedTable.class, 0).get().getData().get(1).get(2));
+
+	}
+	
+	@Test
+	public void testSimpleMessage() throws Exception {
+		Assert.assertEquals(
+			Message.of(
+				Arrays.asList(
+					Paragraph.of(
+						Arrays.stream(new String[] {"this", "is", "it"})
+							.map(s -> Word.of(s))
+							.collect(Collectors.toList())
+						))), smp.parseMessage("<messageML><p>this is it</p></messageML>", null));
+	}
+	
+	
+	@Test
+	public void testTaggedMessage() throws Exception {
+		EntityJson ej = entityJsonConverter.readValue("{\"0\":{\"id\":[{\"type\":\"com.symphony.user.userId\",\"value\":\"347583113331315\"}],\"type\":\"com.symphony.user.mention\"},\"1\":{\"id\":[{\"type\":\"com.symphony.user.userId\",\"value\":\"345315370604167\"}],\"type\":\"com.symphony.user.mention\"},\"2\":{\"id\":[{\"type\":\"com.symphony.user.userId\",\"value\":\"345315370598706\"}],\"type\":\"com.symphony.user.mention\"}}");
+		Assert.assertEquals(
+			Message.of(
+				Arrays.asList(
+					Paragraph.of(Collections.emptyList()),
+					Paragraph.of(Arrays.asList(
+							Word.of("/help"), 
+							new UserDef("347583113331315", "Rob Moffat", null),
+							new UserDef("345315370604167", "Mark Mainwood", null),
+							new UserDef("345315370598706", "James Tan", null))))), 
+			smp.parseMessage(
+				"<div data-format=\"PresentationML\" data-version=\"2.0\" class=\"wysiwyg\"><p> </p><p>/help <span class=\"entity\" data-entity-id=\"0\">@Rob Moffat</span> <span class=\"entity\" data-entity-id=\"1\">@Mark Mainwood</span> <span class=\"entity\" data-entity-id=\"2\">@James Tan</span> </p></div>",
+				ej));
+	}
+	
+
+}
diff --git a/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestSymphonyResponseHandler.java b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestSymphonyResponseHandler.java
new file mode 100644
index 000000000..f673bfe22
--- /dev/null
+++ b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestSymphonyResponseHandler.java
@@ -0,0 +1,115 @@
+package com.github.deutschebank.symphony.workflow;
+
+import java.util.Collections;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.validation.Errors;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.content.RoomDef;
+import com.github.deutschebank.symphony.workflow.content.UserDef;
+import com.github.deutschebank.symphony.workflow.fixture.TestOb3;
+import com.github.deutschebank.symphony.workflow.fixture.TestObject;
+import com.github.deutschebank.symphony.workflow.fixture.TestWorkflowConfig;
+import com.github.deutschebank.symphony.workflow.form.Button;
+import com.github.deutschebank.symphony.workflow.form.Button.Type;
+import com.github.deutschebank.symphony.workflow.response.FormResponse;
+import com.github.deutschebank.symphony.workflow.response.MessageResponse;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.AttachmentHandler;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.EntityJsonConverter;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.FormMessageMLConverter;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.SymphonyResponseHandler;
+import com.github.deutschebank.symphony.workflow.sources.symphony.room.SymphonyRooms;
+import com.github.deutschebank.symphony.workflow.validation.ErrorHelp;
+
+public class TestSymphonyResponseHandler extends AbstractMockSymphonyTest {
+	
+	@MockBean
+	SymphonyRooms rooms;
+	
+	SymphonyResponseHandler responseHandler;
+	
+	@Autowired
+	EntityJsonConverter entityJsonConverter;
+	
+	@Autowired
+	Workflow wf;
+	
+	@Autowired
+	AttachmentHandler ah;
+	
+	@Before
+	public void setup() {
+		responseHandler = new SymphonyResponseHandler(messagesApi, new FormMessageMLConverter(rooms), entityJsonConverter, rooms, ah);
+	}
+	
+	@Test
+	public void testSendMessage() {
+		Mockito.when(messagesApi.v4StreamSidMessageCreatePost(Mockito.isNull(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.isNull(), Mockito.isNull(),Mockito.isNull(), Mockito.isNull()))
+		.then(a -> {
+			Assert.assertEquals(TestWorkflowConfig.room.getId(), a.getArgument(1));
+			Assert.assertEquals("<messageML> - <hash tag=\"testobjects-workflow\" />  - <hash tag=\"symphony-workflow\" />  - <hash tag=\"com-db-symphonyp-workflow-testobject\" /> testing</messageML>", a.getArgument(2));
+			Assert.assertEquals("{\"workflow_001\":{\"type\":\"com.db.symphonyp.workflow.testObject\",\"version\":\"1.0\",\"isin\":\"213\",\"bidAxed\":true,\"askAxed\":false,\"creator\":\"rob@here.com\",\"bidQty\":55,\"askQty\":22}}", a.getArgument(3));
+			return null;
+		});
+		
+		MessageResponse mr = new MessageResponse(wf, TestWorkflowConfig.room, new TestObject("213", true, false, "rob@here.com", 55, 22), "test name", "test instruction", "testing");
+		responseHandler.accept(mr);
+	}
+
+	@Test
+	public void testSendEmptyForm() {
+		Mockito.when(messagesApi.v4StreamSidMessageCreatePost(Mockito.isNull(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.isNull(), Mockito.isNull(),Mockito.isNull(), Mockito.isNull()))
+		.then(a -> {
+			Assert.assertEquals(TestWorkflowConfig.room, a.getArgument(1));
+			Assert.assertEquals("<messageML> - <hash tag=\"axes-workflow\" />  - <hash tag=\"symphony-workflow\" />"+
+			" <form id=\"com.db.symphonyp.workflow.TestObject\" ><text-field name=\"isin.\" placeholder=\"isin\" ></text-field><checkbox name=\"bidAxed.\" value=\"true\" >bidAxed</checkbox><checkbox name=\"askAxed.\" value=\"true\" >askAxed</checkbox>"+
+			"<text-field name=\"creator.\" placeholder=\"creator\" ></text-field><text-field name=\"bidQty.\" placeholder=\"bidQty\" ></text-field><text-field name=\"askQty.\" placeholder=\"askQty\" ></text-field>"
+			+"<button name=\"OK\" type=\"action\" >Click me</button></form></messageML>", a.getArgument(2));
+			Assert.assertEquals("{\"workflow_001\":{\"type\":\"com.db.symphonyp.workflow.testObject\",\"version\":\"1.0\",\"isin\":\"213\",\"bidAxed\":true,\"askAxed\":false,\"creator\":\"rob@here.com\",\"bidQty\":55,\"askQty\":22}}", a.getArgument(3));
+			return null;
+		});
+		
+		FormResponse fr = new FormResponse(wf, TestWorkflowConfig.room, null,  "test name", "test instruction", TestObject.class, true, Collections.singletonList(new Button("OK", Type.ACTION, "Click me")));
+		responseHandler.accept(fr);
+	}
+	
+	@Test
+	public void testSendFormWithError() {
+		Mockito.when(messagesApi.v4StreamSidMessageCreatePost(Mockito.isNull(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.isNull(), Mockito.isNull(),Mockito.isNull(), Mockito.isNull()))
+		.then(a -> {
+			Assert.assertEquals(TestWorkflowConfig.room, a.getArgument(1));
+			Assert.assertEquals("<messageML> - <hash tag=\"axes-workflow\" />  - <hash tag=\"symphony-workflow\" />  - <hash tag=\"com-db-axes-axe\" /> testing</messageML>", a.getArgument(2));
+			Assert.assertEquals("{\"workflow_001\":{\"type\":\"com.db.symphonyp.workflow.testObject\",\"version\":\"1.0\",\"isin\":\"213\",\"bidAxed\":true,\"askAxed\":false,\"creator\":\"rob@here.com\",\"bidQty\":55,\"askQty\":22}}", a.getArgument(3));
+			return null;
+		});
+		
+		TestObject a = new TestObject("213", true, false, "rob@here.com", 55, 22);
+		Errors e= ErrorHelp.createErrorHolder();
+		e.rejectValue("isin.", "32432");
+		FormResponse fr = new FormResponse(wf, TestWorkflowConfig.room, null,  "test name", "test instruction", a, true, Collections.singletonList(new Button("OK", Type.ACTION, "Click me")), e);
+		responseHandler.accept(fr);
+	}
+	
+	@Test
+	public void testSendWithNestedWorflowObjects() {
+		Mockito.when(messagesApi.v4StreamSidMessageCreatePost(Mockito.isNull(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.isNull(), Mockito.isNull(),Mockito.isNull(), Mockito.isNull()))
+		.then(a -> {
+			Assert.assertEquals(TestWorkflowConfig.room, a.getArgument(1));
+			Assert.assertEquals("<messageML> - <hash tag=\"axes-workflow\" />  - <hash tag=\"symphony-workflow\" />  - <hash tag=\"com-db-axes-axe\" /> testing</messageML>", a.getArgument(2));
+			Assert.assertEquals("{\"workflow_001\":{\"type\":\"com.db.symphonyp.workflow.testObject\",\"version\":\"1.0\",\"isin\":\"213\",\"bidAxed\":true,\"askAxed\":false,\"creator\":\"rob@here.com\",\"bidQty\":55,\"askQty\":22}}", a.getArgument(3));
+			return null;
+		});
+		
+		TestOb3 a = new TestOb3(new RoomDef("abc", "asds", true, null), new UserDef(null, "Graham Bobki", "graham@goodle.com"), "some text");
+		Errors e= ErrorHelp.createErrorHolder();
+		e.rejectValue("isin.", "32432");
+		FormResponse fr = new FormResponse(wf, TestWorkflowConfig.room, null,  "test name", "test instruction", a, true, Collections.singletonList(new Button("OK", Type.ACTION, "Click me")), e);
+		responseHandler.accept(fr);
+	}
+}
diff --git a/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestTableEdit.java b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestTableEdit.java
new file mode 100644
index 000000000..a4dda402a
--- /dev/null
+++ b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestTableEdit.java
@@ -0,0 +1,100 @@
+package com.github.deutschebank.symphony.workflow;
+
+import static com.github.deutschebank.symphony.workflow.fixture.TestWorkflowConfig.room;
+import static com.github.deutschebank.symphony.workflow.fixture.TestWorkflowConfig.u;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.fixture.TestObject;
+import com.github.deutschebank.symphony.workflow.fixture.TestObjects;
+import com.github.deutschebank.symphony.workflow.fixture.TestWorkflowConfig;
+import com.github.deutschebank.symphony.workflow.response.FormResponse;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.ElementsAction;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.FormConverter.UnconvertedContent;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.edit.TableAddRow;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.edit.TableDeleteRows;
+import com.github.deutschebank.symphony.workflow.sources.symphony.elements.edit.TableEditRow;
+
+public class TestTableEdit extends AbstractMockSymphonyTest {
+
+	@Autowired
+	Workflow wf;
+	
+	private TestObjects to;
+	
+	@Autowired
+	TableEditRow editRow;
+	
+	@Autowired
+	TableDeleteRows deleteRows;
+	
+	@Autowired
+	TableAddRow addRows;
+	
+	
+	
+	@Before
+	public void setup() {
+		to = TestWorkflowConfig.createTestObjects();
+	}
+	
+	@Test
+	public void testAddRow() {
+		ElementsAction ea = new ElementsAction(wf, room, u, null, "items."+TableAddRow.ACTION_SUFFIX, to);
+		FormResponse fr = (FormResponse) addRows.apply(ea).get(0);
+		Assert.assertEquals(TestObject.class, fr.getFormClass());
+		Assert.assertEquals("New Test Object", fr.getName());
+		
+		// ok, make changes and post back
+		TestObject newTo = (TestObject) fr.getFormObject();
+		newTo.setCreator("newb@thing.com");
+		newTo.setIsin("isiny");
+		newTo.setBidAxed(true);
+		newTo.setBidQty(324);
+		ea = new ElementsAction(wf, room, u, newTo, "items."+TableAddRow.DO_SUFFIX, to);
+		fr = (FormResponse) addRows.apply(ea).get(0);
+		
+		Assert.assertEquals(3, ((TestObjects) fr.getData()).getItems().size()); 
+		Assert.assertEquals(newTo, ((TestObjects) fr.getData()).getItems().get(2)); 
+	}
+	
+	@Test
+	public void testEditRow() {
+		ElementsAction ea = new ElementsAction(wf, room, u, null, "items.[0]."+TableEditRow.EDIT_SUFFIX, to);
+		FormResponse fr = (FormResponse) editRow.apply(ea).get(0);
+		Assert.assertEquals(TestObject.class, fr.getFormClass());
+		Assert.assertEquals("Edit Test Object", fr.getName());
+		TestObject formObject2 = (TestObject) fr.getFormObject();
+		Assert.assertEquals(to.getItems().get(0), formObject2);
+		
+		TestObject newTo = new TestObject();
+		newTo.setCreator("newb@thing.com");
+		newTo.setIsin("isiny");
+		newTo.setBidAxed(true);
+		newTo.setBidQty(324);
+		
+		ea = new ElementsAction(wf, room, u, newTo, "items.[0]."+TableEditRow.UPDATE_SUFFIX, to);
+		fr = (FormResponse) editRow.apply(ea).get(0);
+		Assert.assertEquals(TestObjects.class, fr.getFormClass());
+		TestObjects out = (TestObjects) fr.getFormObject();
+		Assert.assertEquals(out.getItems().get(0), newTo);
+	}
+	
+	@Test
+	public void testDeleteRows() {
+		Map<String, Object> selects = Collections.singletonMap("items", Collections.singletonList(Collections.singletonMap("selected", "true")));
+		UnconvertedContent uc = new UnconvertedContent(TestObjects.class, selects);
+		ElementsAction ea = new ElementsAction(wf, room, u, uc, "items."+TableDeleteRows.ACTION_SUFFIX, to);
+		FormResponse fr = (FormResponse) deleteRows.apply(ea).get(0);
+		Assert.assertEquals(TestObjects.class, fr.getFormClass());
+		TestObjects formObject2 = (TestObjects) fr.getFormObject();
+		Assert.assertEquals(1, formObject2.getItems().size());
+	}
+}
diff --git a/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestWorkflow.java b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestWorkflow.java
new file mode 100644
index 000000000..e4bce5f12
--- /dev/null
+++ b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/TestWorkflow.java
@@ -0,0 +1,80 @@
+package com.github.deutschebank.symphony.workflow;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.fixture.TestObject;
+import com.github.deutschebank.symphony.workflow.fixture.TestObjects;
+import com.github.deutschebank.symphony.workflow.fixture.TestWorkflowConfig;
+import com.github.deutschebank.symphony.workflow.response.FormResponse;
+import com.github.deutschebank.symphony.workflow.response.Response;
+import com.github.deutschebank.symphony.workflow.room.Rooms;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = {  TestWorkflowConfig.class })
+public class TestWorkflow {
+
+	
+	@Autowired
+	Workflow wf;
+	
+	@MockBean
+	Rooms r;
+	
+	
+	@Test
+	public void testHistoricMethodCall() {
+		List<Response> r = wf.applyCommand(TestWorkflowConfig.u, TestWorkflowConfig.room, "wrap", null, null);
+		Assert.assertEquals(FormResponse.class, r.get(0).getClass());
+		TestObjects expected = new TestObjects(Collections.singletonList(TestWorkflowConfig.INITIAL.getItems().get(1)));
+		Assert.assertEquals(expected, ((FormResponse) r.get(0)).getFormObject());
+		Assert.assertEquals(false, ((FormResponse) r.get(0)).isEditable());	
+	}
+	
+	@Test
+	public void testStaticMethodCall() {
+		List<Response> r = wf.applyCommand(TestWorkflowConfig.u, TestWorkflowConfig.room, "testObjects", null, null);
+		
+		Assert.assertEquals(FormResponse.class, r.get(0).getClass());
+		Assert.assertEquals(TestWorkflowConfig.INITIAL, ((FormResponse) r.get(0)).getFormObject());
+		Assert.assertEquals(false, ((FormResponse) r.get(0)).isEditable());	
+	}
+	
+	@Test
+	public void testParameterizedMethodCall() {
+		List<Response> r = wf.applyCommand(TestWorkflowConfig.u, TestWorkflowConfig.room, "add", null, null);
+		
+		Assert.assertEquals(FormResponse.class, r.get(0).getClass());
+		Assert.assertEquals(null, ((FormResponse) r.get(0)).getFormObject());
+		Assert.assertEquals(TestObject.class, ((FormResponse) r.get(0)).getFormClass());
+		Assert.assertEquals(true, ((FormResponse) r.get(0)).isEditable());	
+	}
+	
+	@Test
+	public void testParameterizedMethodCallWithArgument() {
+		TestObject argument = new TestObject("dj", true, false, "me@rob.com", 23324323, 0);
+		List<Response> r = wf.applyCommand(TestWorkflowConfig.u, TestWorkflowConfig.room, "add", argument, null);
+		
+		List<TestObject> all = new ArrayList<TestObject>();
+		all.addAll(TestWorkflowConfig.INITIAL.getItems());
+		all.add(argument);
+		TestObjects expected = new TestObjects(all);
+
+		
+		Assert.assertEquals(FormResponse.class, r.get(0).getClass());
+		Assert.assertEquals(expected, ((FormResponse) r.get(0)).getFormObject());
+		Assert.assertEquals(TestObjects.class, ((FormResponse) r.get(0)).getFormClass());
+		Assert.assertEquals(false, ((FormResponse) r.get(0)).isEditable());	
+	}
+	
+}
diff --git a/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestOb3.java b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestOb3.java
new file mode 100644
index 000000000..b135a1fbb
--- /dev/null
+++ b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestOb3.java
@@ -0,0 +1,87 @@
+package com.github.deutschebank.symphony.workflow.fixture;
+
+import com.github.deutschebank.symphony.workflow.content.Room;
+import com.github.deutschebank.symphony.workflow.content.User;
+import com.github.deutschebank.symphony.workflow.java.Exposed;
+import com.github.deutschebank.symphony.workflow.java.Work;
+
+@Work(name="Test Object 3", instructions="blah")
+public class TestOb3 {
+
+	private Room r;
+	private User u;
+	private String someText;
+	
+	public Room getR() {
+		return r;
+	}
+	public void setR(Room r) {
+		this.r = r;
+	}
+	public User getU() {
+		return u;
+	}
+	public void setU(User u) {
+		this.u = u;
+	}
+	public String getSomeText() {
+		return someText;
+	}
+	public void setSomeText(String someText) {
+		this.someText = someText;
+	}
+	
+	public TestOb3() {
+	}
+	
+	public TestOb3(Room r, User u, String someText) {
+		super();
+		this.r = r;
+		this.u = u;
+		this.someText = someText;
+	}
+	
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((r == null) ? 0 : r.hashCode());
+		result = prime * result + ((someText == null) ? 0 : someText.hashCode());
+		result = prime * result + ((u == null) ? 0 : u.hashCode());
+		return result;
+	}
+	
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		TestOb3 other = (TestOb3) obj;
+		if (r == null) {
+			if (other.r != null)
+				return false;
+		} else if (!r.equals(other.r))
+			return false;
+		if (someText == null) {
+			if (other.someText != null)
+				return false;
+		} else if (!someText.equals(other.someText))
+			return false;
+		if (u == null) {
+			if (other.u != null)
+				return false;
+		} else if (!u.equals(other.u))
+			return false;
+		return true;
+	}
+	
+	@Exposed(description = "Testing")
+	public static TestOb3 ob3(TestOb3 in) {
+		return in;
+	}
+	
+	
+}
diff --git a/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestOb4.java b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestOb4.java
new file mode 100644
index 000000000..51a249aee
--- /dev/null
+++ b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestOb4.java
@@ -0,0 +1,118 @@
+package com.github.deutschebank.symphony.workflow.fixture;
+
+import com.github.deutschebank.symphony.workflow.content.Author;
+import com.github.deutschebank.symphony.workflow.content.ID;
+import com.github.deutschebank.symphony.workflow.content.User;
+import com.github.deutschebank.symphony.workflow.java.Exposed;
+import com.github.deutschebank.symphony.workflow.java.Work;
+
+@Work(name="Test Object 4", instructions="sundry other fields")
+public class TestOb4 {
+
+	public enum Choice { A, B, C };
+	
+	ID theId = new ID();
+	
+	Choice c;
+	
+	boolean b;
+	
+	Author a= Author.CURRENT_AUTHOR.get();
+	
+	User someUser;
+	
+	public TestOb4() {
+		super();
+	}
+
+	public TestOb4(Choice c, boolean b, Author a, User someUser) {
+		super();
+		this.c = c;
+		this.b = b;
+		this.a = a;
+		this.someUser = someUser;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((a == null) ? 0 : a.hashCode());
+		result = prime * result + (b ? 1231 : 1237);
+		result = prime * result + ((c == null) ? 0 : c.hashCode());
+		result = prime * result + ((someUser == null) ? 0 : someUser.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		TestOb4 other = (TestOb4) obj;
+		if (a == null) {
+			if (other.a != null)
+				return false;
+		} else if (!a.equals(other.a))
+			return false;
+		if (b != other.b)
+			return false;
+		if (c != other.c)
+			return false;
+		if (someUser == null) {
+			if (other.someUser != null)
+				return false;
+		} else if (!someUser.equals(other.someUser))
+			return false;
+		return true;
+	}
+
+	public Choice getC() {
+		return c;
+	}
+
+	public void setC(Choice c) {
+		this.c = c;
+	}
+
+	public boolean isB() {
+		return b;
+	}
+
+	public void setB(boolean b) {
+		this.b = b;
+	}
+
+	public Author getA() {
+		return a;
+	}
+
+	public void setA(Author a) {
+		this.a = a;
+	}
+
+	public User getSomeUser() {
+		return someUser;
+	}
+
+	public void setSomeUser(User someUser) {
+		this.someUser = someUser;
+	}
+
+	public ID getTheId() {
+		return theId;
+	}
+
+	public void setTheId(ID theId) {
+		this.theId = theId;
+	}
+
+	@Exposed(description = "Testing")
+	public static TestOb4 ob4(TestOb4 in) {
+		return in;
+	}
+	
+}
diff --git a/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestObject.java b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestObject.java
new file mode 100644
index 000000000..417030218
--- /dev/null
+++ b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestObject.java
@@ -0,0 +1,150 @@
+package com.github.deutschebank.symphony.workflow.fixture;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.Size;
+
+import com.github.deutschebank.symphony.workflow.java.Exposed;
+import com.github.deutschebank.symphony.workflow.java.Work;
+
+@Work(name="Test Object", instructions="blah")
+public class TestObject {
+
+	@Size(min=12)
+	private String isin;
+	private boolean bidAxed;
+	private boolean askAxed;
+	
+	@Email
+	private String creator;
+	private Number bidQty;
+	private Number askQty;
+	
+	public TestObject() {
+		super();
+	}
+
+	public TestObject(String isin, boolean bidAxed, boolean askAxed, String creator, Number bidAmount, Number askAmount) {
+		super();
+		this.isin = isin;
+		this.bidAxed = bidAxed;
+		this.askAxed = askAxed;
+		this.creator = creator;
+		this.bidQty= bidAmount;
+		this.askQty = askAmount;
+	}
+
+	public String getIsin() {
+		return isin;
+	}
+
+	public void setIsin(String isin) {
+		this.isin = isin;
+	}
+
+	public boolean isBidAxed() {
+		return bidAxed;
+	}
+
+	public void setBidAxed(boolean bidAxed) {
+		this.bidAxed = bidAxed;
+	}
+
+	public boolean isAskAxed() {
+		return askAxed;
+	}
+
+	public void setAskAxed(boolean askAxed) {
+		this.askAxed = askAxed;
+	}
+
+	public String getCreator() {
+		return creator;
+	}
+
+	public void setCreator(String creator) {
+		this.creator = creator;
+	}
+
+	public Number getBidQty() {
+		return bidQty;
+	}
+
+	public void setBidQty(Number bidQty) {
+		this.bidQty = bidQty;
+	}
+
+	public Number getAskQty() {
+		return askQty;
+	}
+
+	public void setAskQty(Number askQty) {
+		this.askQty = askQty;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + (askAxed ? 1231 : 1237);
+		result = prime * result + ((askQty == null) ? 0 : askQty.hashCode());
+		result = prime * result + (bidAxed ? 1231 : 1237);
+		result = prime * result + ((bidQty == null) ? 0 : bidQty.hashCode());
+		result = prime * result + ((creator == null) ? 0 : creator.hashCode());
+		result = prime * result + ((isin == null) ? 0 : isin.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		TestObject other = (TestObject) obj;
+		if (askAxed != other.askAxed)
+			return false;
+		if (askQty == null) {
+			if (other.askQty != null)
+				return false;
+		} else if (!askQty.equals(other.askQty))
+			return false;
+		if (bidAxed != other.bidAxed)
+			return false;
+		if (bidQty == null) {
+			if (other.bidQty != null)
+				return false;
+		} else if (!bidQty.equals(other.bidQty))
+			return false;
+		if (creator == null) {
+			if (other.creator != null)
+				return false;
+		} else if (!creator.equals(other.creator))
+			return false;
+		if (isin == null) {
+			if (other.isin != null)
+				return false;
+		} else if (!isin.equals(other.isin))
+			return false;
+		return true;
+	}
+
+	@Exposed(description="wraps this testObject into the list")
+	public TestObjects wrap() {
+		List<TestObject> l = new ArrayList<>();
+		l.add(this);
+		return new TestObjects(l);
+	}
+
+	@Override
+	public String toString() {
+		return "TestObject [isin=" + isin + ", bidAxed=" + bidAxed + ", askAxed=" + askAxed + ", creator=" + creator
+				+ ", bidQty=" + bidQty + ", askQty=" + askQty + "]";
+	}
+
+	
+}
diff --git a/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestObjects.java b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestObjects.java
new file mode 100644
index 000000000..39f8c12f6
--- /dev/null
+++ b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestObjects.java
@@ -0,0 +1,87 @@
+package com.github.deutschebank.symphony.workflow.fixture;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.Valid;
+
+import com.github.deutschebank.symphony.workflow.java.Exposed;
+import com.github.deutschebank.symphony.workflow.java.Work;
+
+@Work(editable=true, instructions="basket of stuff", name = "List of Test Objects")
+public class TestObjects {
+
+	@Valid
+	private List<TestObject> items;
+
+	public TestObjects() {
+		super();
+	}
+
+	public TestObjects(List<TestObject> items) {
+		super();
+		this.items = items;
+	}
+
+	public List<TestObject> getItems() {
+		return items;
+	}
+
+	public void setItems(List<TestObject> items) {
+		this.items = items;
+	}
+	
+	@Exposed
+	public TestObjects show() {
+		return this;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((items == null) ? 0 : items.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		TestObjects other = (TestObjects) obj;
+		if (items == null) {
+			if (other.items != null)
+				return false;
+		} else if (!items.equals(other.items))
+			return false;
+		return true;
+	}
+	
+	@Exposed
+	public TestObjects remove(int i) {
+		items.remove(i);
+		return this;
+	}
+	
+	@Exposed(description= "creates a new test objects")
+	public static TestObjects testObjects() {
+		return TestWorkflowConfig.INITIAL;
+	}
+	
+	@Exposed(description = "Add another test object")
+	public TestObjects add(TestObject o) {
+		List<TestObject> chg = new ArrayList<>(items);
+		chg.add(o);
+		return new TestObjects(chg);
+	}
+
+	@Override
+	public String toString() {
+		return "TestObjects [items=" + items + "]";
+	}
+	
+}
diff --git a/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestWorkflowConfig.java b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestWorkflowConfig.java
new file mode 100644
index 000000000..5ba453b7d
--- /dev/null
+++ b/chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/TestWorkflowConfig.java
@@ -0,0 +1,84 @@
+package com.github.deutschebank.symphony.workflow.fixture;
+
+import java.math.BigDecimal;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.github.deutschebank.symphony.workflow.Workflow;
+import com.github.deutschebank.symphony.workflow.content.Addressable;
+import com.github.deutschebank.symphony.workflow.content.Room;
+import com.github.deutschebank.symphony.workflow.content.RoomDef;
+import com.github.deutschebank.symphony.workflow.content.User;
+import com.github.deutschebank.symphony.workflow.content.UserDef;
+import com.github.deutschebank.symphony.workflow.history.History;
+import com.github.deutschebank.symphony.workflow.java.ClassBasedWorkflow;
+import com.github.deutschebank.symphony.workflow.room.Rooms;
+import com.github.deutschebank.symphony.workflow.sources.symphony.handlers.EntityJsonConverter;
+
+@Configuration
+public class TestWorkflowConfig {
+
+	public static final TestObjects INITIAL = createTestObjects();
+	
+	public static final List<String> ADMIN_EMAILS = Collections.singletonList("robert.moffat@example.com");
+	
+	public static TestObjects createTestObjects() {
+		return new TestObjects(
+			new ArrayList<>(Arrays.asList(
+				new TestObject("83274239874", true, true, "rob@example.com", 234786, 2138),
+				new TestObject("AUD274239874", true, false, "gregb@example.com", 2386, new BigDecimal("234823498.573")))));
+	}
+
+	public static final User u = new UserDef("123", "Testy McTestFace", "tmt@example.com");
+	public static final Room room = new RoomDef("Test Room",  "Test Room Desc", false, null);
+	
+	@Bean
+	public History history(Workflow wf) {
+		History h = new History() {
+			
+			@Override
+			public <X> Optional<X> getLastFromHistory(Class<X> type, Addressable address) {
+				if (type == TestObject.class) {
+					return Optional.of((X) INITIAL.getItems().get(1));
+				} else if (type == TestObjects.class) {
+					return Optional.of((X) INITIAL);
+				} else {
+					throw new IllegalArgumentException();
+				}
+			}
+			
+			@Override
+			public <X> List<X> getFromHistory(Class<X> type, Addressable address, Instant since) {
+				if (type == TestObject.class) {
+					return (List<X>) INITIAL.getItems();
+				} else if (type == TestObjects.class) {
+					return (List<X>) Collections.singletonList(INITIAL);
+				} else {
+					throw new IllegalArgumentException();
+				}
+			}
+		};
+		
+		wf.registerHistoryProvider(h);
+		return h;
+	}
+	
+	@Bean
+	public Workflow testObjectsWorkflow() {
+		ClassBasedWorkflow basicWorkflow = new ClassBasedWorkflow("TestObjects-workflow", Collections.singletonList(u), Collections.singletonList(room));
+		basicWorkflow.addClass(TestObjects.class);
+		basicWorkflow.addClass(TestObject.class);
+		basicWorkflow.addClass(TestOb3.class);
+		basicWorkflow.addClass(TestOb4.class);
+		return basicWorkflow;
+	}
+
+}
diff --git a/pom.xml b/pom.xml
index 9f248e211..496602545 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
 		<module>quickfix-json</module>
 		<module>shared-stream</module>
 		<module>symphony-maven-build-reporter</module>
+		<module>chat-workflow</module>
 	</modules>
 
 	<properties>
@@ -149,7 +150,7 @@
 				<groupId>com.github.deutschebank.symphony</groupId>
 				<artifactId>symphony-maven-build-reporter</artifactId>
 				<!-- since we are building the build reporter, this must refer to an earlier, built version -->
-				<version>4.55.13</version>
+				<version>4.59.2</version>
 			</extension>
 		</extensions>