diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..4f5e2e1
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,20 @@
+sudo: false
+
+addons:
+  apt:
+    packages:
+    - libgmp-dev
+
+# Caching so the next build will be fast too.
+cache:
+  directories:
+  - $HOME/.stack
+
+before_install:
+# Download and unpack the stack executable
+- mkdir -p ~/.local/bin
+- export PATH=$HOME/.local/bin:$PATH
+- travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
+
+script:
+- stack --no-terminal --install-ghc test
diff --git a/README.md b/README.md
index f8d063e..f9ee1c6 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Blast: Distributed Computing in Haskell
 
+[![Build Status](https://travis-ci.org/jcmincke/Blast.svg?branch=master)](https://travis-ci.org/jcmincke/Blast)
+
 **Blast** is a pure Haskell library for doing distributed computing. It has the following characteristics:
 
 * Works on any RPC backend. The current implementation runs on both local threads and CloudHaskell.
@@ -19,7 +21,7 @@ Builds the library and the examples.
 
 ## Examples
 
-Each example can be run on 2 backends: 
+Each example can be run on 2 backends:
 
 * A local backend that uses local threads.
 * A CloudHaskell backend.
@@ -78,4 +80,4 @@ Copyright (c) 2016-2017 Jean-Christophe Mincke.
 All rights reserved.
 
 **Blast** is free software, and may be redistributed under the terms
-specified in the [LICENSE](LICENSE) file.
\ No newline at end of file
+specified in the [LICENSE](LICENSE) file.
diff --git a/blast.cabal b/blast.cabal
index 5c73240..6d106f4 100644
--- a/blast.cabal
+++ b/blast.cabal
@@ -13,7 +13,6 @@ build-type:          Simple
 
 cabal-version:       >=1.10
 
--- extra-source-files:
 
 source-repository head
   type: git
@@ -68,8 +67,6 @@ library
   ghc-options:         -Wall
 
 
-
-
 test-suite blast-test
   type:                exitcode-stdio-1.0
   hs-source-dirs:      test
@@ -87,4 +84,5 @@ test-suite blast-test
                      , transformers
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N
   default-language:    Haskell2010
-
+  other-modules:       Test.Computation
+                     , Test.Syntax
diff --git a/examples/blast-examples.cabal b/examples/blast-examples.cabal
index e635a6a..9219e1d 100644
--- a/examples/blast-examples.cabal
+++ b/examples/blast-examples.cabal
@@ -34,6 +34,7 @@ executable simple
     , vault
     , blast
   default-language:    Haskell2010
+  other-modules:       Common
 
 
 executable kmeans
@@ -57,6 +58,7 @@ executable kmeans
     , vault
     , blast
   default-language:    Haskell2010
+  other-modules:       Common
 
 
 executable wordcount
@@ -84,5 +86,4 @@ executable wordcount
     , vector
     , blast
   default-language:    Haskell2010
-
-
+  other-modules:       Common
diff --git a/stack.yaml b/stack.yaml
index d336aea..975053a 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,42 +1,11 @@
-# This file was automatically generated by stack init
-# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/
-
-# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
 resolver: lts-8.2
 
-# Local packages, usually specified by relative directory name
 packages:
 - '.'
 - examples
 
-# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
-extra-deps: [
-  distributed-process-client-server-0.1.3.2
-  ,distributed-process-extras-0.2.1.2
-  , distributed-process-async-0.2.3
-  , distributed-static-0.3.5.0
-]
-
-# Override default flag values for local packages and extra-deps
-flags: {}
-
-# Extra package databases containing global packages
-extra-package-dbs: []
-
-# Control whether we use the GHC we find on the path
-# system-ghc: true
-
-# Require a specific version of stack, using version ranges
-# require-stack-version: -any # Default
-# require-stack-version: >= 1.0.0
-
-# Override the architecture used by stack, especially useful on Windows
-# arch: i386
-# arch: x86_64
-
-# Extra directories used by stack for building
-# extra-include-dirs: [/path/to/dir]
-# extra-lib-dirs: [/path/to/dir]
-
-# Allow a newer minor version of GHC than the snapshot specifies
-# compiler-check: newer-minor
+extra-deps:
+- distributed-process-client-server-0.1.3.2
+- distributed-process-extras-0.2.1.2
+- distributed-process-async-0.2.3
+- distributed-static-0.3.5.0