diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..50e9565
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at andrew@andrewresearch.net. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..9126b8c
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+## How to Contribute
+
+Before contributing with a pull request, please open an issue to discuss changes with the repo maitainers.
diff --git a/src/main/scala/au/edu/utscic/athanorserver/message/Json.scala b/src/main/scala/au/edu/utscic/athanorserver/message/Json.scala
index 984e1f7..1574eb3 100644
--- a/src/main/scala/au/edu/utscic/athanorserver/message/Json.scala
+++ b/src/main/scala/au/edu/utscic/athanorserver/message/Json.scala
@@ -20,7 +20,6 @@ object Json {
   case class Results(message:String,results:JValue)
 
 
-  def formatStringResults(results:String, message:String):Future[Results] = Future(Results(message,Extraction.decompose(results)))
 
   def formatResults[T](results:Future[T], message:String):Future[Results] = results.map { r =>
     Results(message, Extraction.decompose(r))
diff --git a/src/main/scala/au/edu/utscic/athanorserver/server/TextAnalysisHandler.scala b/src/main/scala/au/edu/utscic/athanorserver/server/TextAnalysisHandler.scala
index f005389..2a3e906 100644
--- a/src/main/scala/au/edu/utscic/athanorserver/server/TextAnalysisHandler.scala
+++ b/src/main/scala/au/edu/utscic/athanorserver/server/TextAnalysisHandler.scala
@@ -12,7 +12,7 @@ import org.json4s.NoTypeHints
 import org.json4s.jackson.Serialization
 
 import scala.concurrent.Future
-
+import scala.Serializable
 /**
   * Created by andrew@andrewresearch.net on 20/2/17.
   */
@@ -29,26 +29,23 @@ object TextAnalysisHandler {
       case _ =>
         throw UnknownAnalysisType("Unknown analysis type")
     }
-    val pipelineResults = TextPipeline(msg.byteStr,pipeline).run
+    val pipelineResults = Source.single(msg.byteStr) via this.process runWith(Sink.head[List[List[String]]]) //TextPipeline(msg.byteStr,pipeline).run
     Json.formatResults(pipelineResults,"Text Analysis Results")
   }
 
-  val process:Flow[ByteString,String,NotUsed] = Flow[ByteString].map { bs =>
+  val process:Flow[ByteString,List[List[String]],NotUsed] = Flow[ByteString].map { bs =>
     val inputText = bs.utf8String
     val start = System.currentTimeMillis()
     val parsedSentences = TextParser.parse(inputText)
     val mid = System.currentTimeMillis()
     val nlpTime = (mid-start)
     val results = parsedSentences.map { ps =>
-      val jsonString:String = Athanor.parsedSentenceToJsonString(ps)
-      Athanor.analyseJson(jsonString)
+      Athanor.analyseParsedSentence(ps)
     }
     val end = System.currentTimeMillis()
     val athTime = (end-mid)
     log.info("Process times for {} characters - coreNlp: {} athanor: {}",inputText.length,nlpTime,athTime)
-    implicit val formats = Serialization.formats(NoTypeHints)
-    import Serialization.write
-    write(results)
+    results
   }
 
   val demo:Flow[ByteString,String,NotUsed] = Flow[ByteString].map { bs =>
@@ -59,9 +56,9 @@ object TextAnalysisHandler {
     Athanor.analyseJson(Athanor.demoFile).mkString(",")
   }
 
-  case class TextPipeline(inputStr: ByteString, flow: Flow[ByteString,String,NotUsed]) {
+  case class TextPipeline(inputStr: ByteString, flow: Flow[ByteString,List[List[String]],NotUsed]) {
     import StreamsContext.materializer
     val source: Source[ByteString, NotUsed] = Source.single(inputStr)
-    def run: Future[String] = source via flow runWith Sink.head[String]
+    def run = source via flow runWith Sink.head[List[List[String]]]
   }
 }