diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ae1aeed
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+src/main/resources/application.conf
+project/target
+target
+*.swp
+.classpath
+.project
+.settings
+bin
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..a2fe52f
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2015-2016  IBM Corporation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..19e9cd7
--- /dev/null
+++ b/README.md
@@ -0,0 +1,30 @@
+# Slackbot for OpenWhisk
+
+This repository contains proof-of-concept-quality code to deploy a Slackbot with the capability to run [OpenWhisk](https://github.com/openwhisk/openwhisk) actions.
+
+## Setup
+
+1. Copy `src/main/resources/application.conf.template` to `src/main/resources/application.conf` and fill in the credentials as indicated in the comments.
+
+2. Run `slack.whisk.Main`.
+
+You can run either from `sbt` directly, or use `sbt eclipse` to generate an Eclipse project and create a run configuration from there.
+
+## Usage
+
+(Assuming your bot is called `@whiskbot`.)
+
+Send a run command either as a direct message, or using a mention in a channel where the bot was invited:
+
+    @whiskbot: please run this for me:
+    ```function main(args) {
+        return { "greeting": "Hello " + args.name + "!" };
+    }```
+    ```{ "name" : "visitor" }```
+
+The message needs to contain the keywords "run", "please", and two triple-quoted blocks; one for the JavaScript code, and one for the action payload.
+
+## Caveat emptor
+
+* The bot currently only supports JavaScript actions.
+* The bot will stop if the websocket connection is lost.
diff --git a/build.sbt b/build.sbt
new file mode 100644
index 0000000..507d05e
--- /dev/null
+++ b/build.sbt
@@ -0,0 +1,13 @@
+name := "slack-whisk"
+
+scalaVersion := "2.11.8"
+
+libraryDependencies ++= Seq(
+  "com.typesafe.akka" %% "akka-actor" % "2.4.8",
+  "com.typesafe.akka" %% "akka-http-core" % "2.4.8",
+  "com.typesafe.akka" %% "akka-http-experimental" % "2.4.8",
+  "com.typesafe.akka" %% "akka-http-spray-json-experimental" % "2.4.8",
+  "com.typesafe.akka" %% "akka-stream" % "2.4.8"
+)
+
+libraryDependencies += "com.github.gilbertw1" %% "slack-scala-client" % "0.1.7"
diff --git a/project/plugins.sbt b/project/plugins.sbt
new file mode 100644
index 0000000..737941d
--- /dev/null
+++ b/project/plugins.sbt
@@ -0,0 +1 @@
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")
diff --git a/src/main/resources/application.conf.template b/src/main/resources/application.conf.template
new file mode 100644
index 0000000..4a6ebe7
--- /dev/null
+++ b/src/main/resources/application.conf.template
@@ -0,0 +1,13 @@
+slack {
+    // The API token shown on the Slack "Integration Settings" page.
+    bot.token = "xaxb-01234567890-..."
+}
+
+whisk {
+    // Your OpenWhisk credentials. Same as in your ~/.wskprops file.
+    credentials {
+        apihost = "openwhisk.ng.bluemix.net"
+        namespace = "example@example.com_dev"
+        auth = "....:...."
+    }
+}
diff --git a/src/main/scala/slack/whisk/ActionRunnerBot.scala b/src/main/scala/slack/whisk/ActionRunnerBot.scala
new file mode 100644
index 0000000..340c872
--- /dev/null
+++ b/src/main/scala/slack/whisk/ActionRunnerBot.scala
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2015-2016 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package slack.whisk
+
+import slack.whisk.util.JsParser
+
+import scala.util.Try
+
+import akka.actor.ActorSystem
+
+import spray.json._
+import spray.json.DefaultJsonProtocol._
+
+/* Listen to private messages and mentions, and if they contain the keywords "run" and "please",
+ * attempts to parse message as action code and action payload and create+run the action on the
+ * configured Whisk deployment.
+ */
+class ActionRunnerBot(send: JsObject=>Unit, botInfo: SlackRTMBotInfo)(implicit val actorSystem: ActorSystem) extends SlackBot(send) {
+    private implicit val executionContext = actorSystem.dispatcher
+
+    private val whiskClient = new WhiskClient()
+
+    override def onMessage(msg: JsObject) : Unit = msg.fields("type").convertTo[String] match {
+        case "message" =>
+            handleMessage(msg
+                .fields("text").convertTo[String]
+                .replaceAll("“", "\"")
+                .replaceAll("”", "\"")
+                , msg)
+
+        case _ =>
+    }
+
+    private def handleMessage(text: String, msg: JsObject) : Unit = {
+        val channel = msg.fields("channel").convertTo[String]
+        val sender  = msg.fields("user").convertTo[String]
+
+        val shouldConsider = channel.startsWith("D") || text.contains(s"<@${botInfo.selfId}>")
+
+        if(!shouldConsider)
+            return
+
+        if(text.contains("run") && text.contains("please")) {
+            val codeBlockPattern = """```([^`]+)```""".r
+
+            val matches = codeBlockPattern.findAllIn(text).map(s => s.substring(3, s.length - 3)).toList
+
+            if(matches.length != 2) {
+                sendMessage(channel, s"Sorry, <@$sender>, I'd love to run your action but this requires exactly two code blocks (one for the JS code, one for the `args` JSON object).")
+                return
+            }
+
+            val codeStr = matches(0)
+            val argsStr = matches(1)
+
+            val parseResult = JsParser.parse(codeStr)
+            if(parseResult.isLeft) {
+                sendMessage(channel, s"Sorry, <@$sender>, I couldn't parse your JavaScript code:\n```${parseResult.left.get}```")
+                return
+            }
+
+            val args = Try(JsonParser(argsStr).asJsObject)
+
+            if(args.isFailure) {
+                sendMessage(channel, s"Sorry, <@$sender>, I couldn't parse your second code block as a JSON object.")
+                return
+            }
+
+            sendMessage(channel, "Creating action...")
+            whiskClient.createJsAction("slack-action", codeStr).map { obj =>
+                val name = obj.fields("name").convertTo[String]
+                sendMessage(channel, "Invoking action...")
+                whiskClient.invokeAction(name, args.get).map { res =>
+                    sendMessage(channel, s"```${res.prettyPrint}```")
+                    sendMessage(channel, s"There you go, <@$sender>.")
+                }.recover { case f =>
+                    sendMessage(channel, s"Sorry, <@$sender>, action invocation failed with: `${f.getMessage}`.")
+                }.andThen { case _ =>
+                    whiskClient.deleteAction(name)
+                }
+            }.recover { case f =>
+                sendMessage(channel, s"Sorry, <@$sender>, action creation failed with: `${f.getMessage}`.")
+            }
+        }
+    }
+
+    private def sendMessage(channel: String, text: String) : Unit = {
+        send(JsObject(
+            "type" -> JsString("message"),
+            "channel" -> JsString(channel),
+            "text" -> JsString(text)
+        ))
+    }
+}
diff --git a/src/main/scala/slack/whisk/Main.scala b/src/main/scala/slack/whisk/Main.scala
new file mode 100644
index 0000000..a023f7c
--- /dev/null
+++ b/src/main/scala/slack/whisk/Main.scala
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2015-2016 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package slack.whisk
+
+import scala.concurrent.Await
+import scala.concurrent.Future
+import scala.concurrent.Promise
+import scala.concurrent.duration._
+
+import akka.Done
+import akka.NotUsed
+import akka.actor.ActorSystem
+import akka.http.scaladsl.Http
+import akka.http.scaladsl.model._
+import akka.http.scaladsl.model.ws._
+import akka.http.scaladsl.unmarshalling._
+import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
+import akka.stream.ActorMaterializer
+import akka.stream.OverflowStrategy
+import akka.stream.QueueOfferResult
+import akka.stream.scaladsl._
+
+import spray.json._
+import spray.json.DefaultJsonProtocol._
+
+import java.util.concurrent.atomic.AtomicInteger
+
+object Main {
+    def main(args : Array[String]) : Unit = {
+        implicit val system = ActorSystem()
+        implicit val executionContext = system.dispatcher
+        implicit val materializer = ActorMaterializer()
+
+        val config = system.settings.config
+
+        val token = config.getString("slack.bot.token")
+
+        val rtmInfo = Await.result(SlackRTM.start(token), Duration.Inf)
+
+        val botInfo = SlackRTMBotInfo(rtmInfo.selfId)
+
+        val queuePromise = Promise[SourceQueue[Message]]
+        val msgSource = Source.queue[Message](10, OverflowStrategy.dropNew).mapMaterializedValue { q =>
+            queuePromise.trySuccess(q)
+        }
+        val futureQueue = queuePromise.future
+        val outgoingMsgCounter = new AtomicInteger(1)
+        val send: JsObject=>Unit = { msg =>
+            futureQueue.onSuccess { case q =>
+                val msgId = outgoingMsgCounter.getAndIncrement()
+                val msgExt = JsObject(msg.fields + ("id" -> JsNumber(msgId)))
+                println("Sending : " + msgExt.toString)
+                q.offer(TextMessage(msgExt.toString)).map { _ match {
+                    case QueueOfferResult.Enqueued =>
+                        // fire-and-forget
+
+                    case QueueOfferResult.Dropped =>
+                        println("Message was dropped. Queue is full.")
+
+                    case QueueOfferResult.QueueClosed =>
+                        println("Queue is closed.")
+
+                    case QueueOfferResult.Failure(f) =>
+                        println("Queue failed: " + f.getMessage)
+                }}
+            }
+        }
+
+        val bots: List[SlackBot] = List(
+            new ActionRunnerBot(send, botInfo)
+        )
+
+        val msgSink: Sink[Message, Future[Done]] = Sink.foreach {
+            case message: TextMessage.Strict =>
+                try {
+                    // FIXME this swallows all errors in all "bots"
+                    val parsed = JsonParser(message.text).asJsObject
+                    bots.foreach(b => b.onMessage(parsed))
+                } catch {
+                    case t : Throwable =>
+                    println("There was an error receiving messages: "+ t.getMessage())
+                    println("Message was: " + message)
+                }
+
+            case x =>
+                println("Dropping message: " + x)
+                // drop it like it's hot
+        }
+
+        val flow: Flow[Message,Message,Future[Done]] =
+            Flow.fromSinkAndSourceMat(msgSink, msgSource)(Keep.left)
+
+        val (upgradeResponse, closed) =
+            Http().singleWebSocketRequest(WebSocketRequest(rtmInfo.wsUrl), flow)
+
+        val connected = upgradeResponse.map { upgrade =>
+            if(upgrade.response.status == StatusCodes.SwitchingProtocols) {
+                Done
+            } else {
+                throw new RuntimeException(s"Connection failed: ${upgrade.response.status}")
+            }
+        }
+
+        connected.onComplete(println)
+        closed.foreach { _ =>
+            println("Closed. Shutting down...")
+            shutItDown()
+        }
+
+        def shutItDown() = {
+            materializer.shutdown()
+            Await.ready(Http().shutdownAllConnectionPools(), Duration.Inf)
+            system.terminate()
+            Await.result(system.whenTerminated, Duration.Inf)
+            System.exit(0)
+        }
+
+        // Press Enter, everything stops.
+        scala.io.StdIn.readLine()
+        println("User input. Shutting down...")
+        shutItDown()
+    }
+}
diff --git a/src/main/scala/slack/whisk/SlackBot.scala b/src/main/scala/slack/whisk/SlackBot.scala
new file mode 100644
index 0000000..a8345f4
--- /dev/null
+++ b/src/main/scala/slack/whisk/SlackBot.scala
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015-2016 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package slack.whisk
+
+import spray.json._
+
+// A very simple abstraction of a Slackbot "actor".
+abstract class SlackBot(val send: JsObject=>Unit) {
+    def onMessage(message: JsObject) : Unit
+}
diff --git a/src/main/scala/slack/whisk/SlackRTM.scala b/src/main/scala/slack/whisk/SlackRTM.scala
new file mode 100644
index 0000000..ac258df
--- /dev/null
+++ b/src/main/scala/slack/whisk/SlackRTM.scala
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015-2016 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package slack.whisk
+
+import scala.concurrent.Future
+
+import akka.actor.ActorSystem
+import akka.http.scaladsl._
+import akka.http.scaladsl.model._
+import akka.http.scaladsl.unmarshalling._
+import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
+import akka.stream.ActorMaterializer
+
+import spray.json._
+import spray.json.DefaultJsonProtocol._
+
+case class SlackRTMBotInfo(
+    selfId: String
+)
+
+case class SlackRTMInfo(
+    wsUrl: String,
+    selfId: String
+)
+
+object SlackRTM {
+    def start(token: String)(implicit system: ActorSystem) : Future[SlackRTMInfo] = {
+        implicit val executionContext = system.dispatcher
+        implicit val materializer = ActorMaterializer()
+
+        // Make an authenticated request to get the websocket endpoint and some more meta info.
+        val request = HttpRequest(
+            method = HttpMethods.GET,
+            uri = Uri()
+                .withScheme("https")
+                .withHost(Uri.Host("slack.com"))
+                .withPath(Uri.Path("/api/rtm.start"))
+                .withQuery(Uri.Query("token" -> token))
+        )
+
+        for(
+            response <- Http().singleRequest(request);
+            jsObject <- Unmarshal(response.entity).to[JsObject]
+        ) yield {
+            SlackRTMInfo(
+                jsObject.fields("url").convertTo[String],
+                jsObject.fields("self").convertTo[JsObject].fields("id").convertTo[String]
+            )
+        }
+    }
+}
diff --git a/src/main/scala/slack/whisk/WhiskClient.scala b/src/main/scala/slack/whisk/WhiskClient.scala
new file mode 100644
index 0000000..a00f8f1
--- /dev/null
+++ b/src/main/scala/slack/whisk/WhiskClient.scala
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2015-2016 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package slack.whisk
+
+import scala.concurrent.Future
+
+import akka.actor.ActorSystem
+import akka.http.scaladsl._
+import akka.http.scaladsl.model._
+import akka.http.scaladsl.model.headers._
+import akka.http.scaladsl.marshalling._
+import akka.http.scaladsl.unmarshalling._
+import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
+import akka.stream.ActorMaterializer
+
+import spray.json._
+
+/* A minimal non-blocking OpenWhisk client.
+ * Currently supports only the endpoints required for the PoC Slackbot.
+ */
+class WhiskClient()(implicit val actorSystem: ActorSystem) {
+    implicit private val executionContext = actorSystem.dispatcher
+    implicit private val materializer = ActorMaterializer()
+
+    private val config = actorSystem.settings.config
+
+    private val apiHost   = config.getString("whisk.credentials.apihost")
+    private val namespace = config.getString("whisk.credentials.namespace")
+    private val auth      = config.getString("whisk.credentials.auth")
+    private val username  = auth.split(":")(0)
+    private val password  = auth.split(":")(1)
+
+    private def authenticatedRequest(
+        method: HttpMethod,
+        path: Uri.Path,
+        query: Uri.Query = Uri.Query.Empty,
+        entity: RequestEntity = HttpEntity.Empty) = HttpRequest(
+        method = method,
+        uri = Uri()
+            .withScheme("https")
+            .withHost(apiHost)
+            .withPath(path)
+            .withQuery(query),
+        headers = List(
+            Authorization(BasicHttpCredentials(username, password)),
+            Accept(MediaTypes.`application/json`)
+        ),
+        entity = entity
+    )
+
+    private def runRequest(futureRequest: Future[HttpRequest]) : Future[JsObject] = {
+        for(
+            request  <- futureRequest;
+            response <- Http().singleRequest(request);
+            jsVal    <- Unmarshal(response.entity).to[JsValue];
+            jsObj    =  jsVal.asJsObject
+        ) yield jsObj
+    }
+
+    def createJsAction(namePrefix: String, code: String) : Future[JsObject] = {
+        val actionName = s"${namePrefix.replaceAll("/", "-")}-${scala.util.Random.nextInt(999999)}"
+
+        val body = JsObject(
+            "exec" -> JsObject(
+                "kind" -> JsString("nodejs"),
+                "code" -> JsString(code)
+            )
+        )
+
+        runRequest(Marshal(body).to[MessageEntity].map { e =>
+            authenticatedRequest(
+                method = HttpMethods.PUT,
+                path = Uri.Path(s"/api/v1/namespaces/$namespace/actions/$actionName"),
+                entity = e
+            )
+        })
+    }
+
+    def invokeAction(name: String, args: JsObject) : Future[JsObject] = {
+        runRequest(Marshal(args).to[MessageEntity].map { e =>
+            authenticatedRequest(
+                method = HttpMethods.POST,
+                path   = Uri.Path(s"/api/v1/namespaces/$namespace/actions/$name"),
+                query  = Uri.Query("blocking" -> "true", "result" -> "true"),
+                entity = e
+            )
+        })
+    }
+
+    def deleteAction(name: String) : Future[JsObject] = {
+        runRequest(Future.successful(
+            authenticatedRequest(
+                method = HttpMethods.DELETE,
+                path   = Uri.Path(s"/api/v1/namespaces/$namespace/actions/$name")
+            )
+        ))
+    }
+}
diff --git a/src/main/scala/slack/whisk/util/JsParser.scala b/src/main/scala/slack/whisk/util/JsParser.scala
new file mode 100644
index 0000000..2a1cb67
--- /dev/null
+++ b/src/main/scala/slack/whisk/util/JsParser.scala
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015-2016 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package slack.whisk.util
+
+import scala.util.Try
+
+import jdk.nashorn.internal.parser.Parser
+import jdk.nashorn.internal.runtime._
+import jdk.nashorn.internal.runtime.options.Options
+
+import java.io.PrintWriter
+import java.io.StringWriter
+
+/* Relies on Java 8 internal JS engine to detect parse errors before the action
+ * is created.
+ */
+object JsParser {
+    def parse(code: String) : Either[String,Unit] = {
+        val options = new Options("nashorn")
+        val ctx = new Context(options, new ErrorManager(), Thread.currentThread.getContextClassLoader)
+        val src = Source.sourceFor("action-code", code)
+        val errorWriter = new StringWriter()
+        val errors = new ErrorManager(new PrintWriter(errorWriter))
+        val parser = new Parser(ctx.getEnv(), src, errors)
+
+        try {
+            parser.parse()
+            if(errors.hasErrors()) {
+                errorWriter.flush()
+                Left(errorWriter.getBuffer().toString())
+            } else {
+                Right(())
+            }
+        } catch {
+            case e: Throwable =>
+                Left(e.getMessage)
+        }
+    }
+}