diff --git a/.appveyor.yml b/.appveyor.yml
index d7ec1ca3..54307862 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -48,6 +48,13 @@ install:
   # not already installed.
   - ps: if (-not(Test-Path($env:PYTHON))) { & scripts\ci\install_python.ps1 }
 
+  # Install Rust nightly and add it to PATH
+  - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
+  - rustup-init -yv --default-toolchain nightly
+  - set PATH=%PATH%;%USERPROFILE%\.cargo\bin
+  - rustc -vV
+  - cargo -vV
+
   # Required in order to get `make` to work
   - "copy C:\\MinGW\\bin\\mingw32-make.exe C:\\MinGW\\bin\\make.exe"
 
diff --git a/.gitmodules b/.gitmodules
index 62c994da..2bb7019c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "aw-watcher-window"]
 	path = aw-watcher-window
 	url = https://github.com/ActivityWatch/aw-watcher-window.git
+[submodule "aw-server-rust"]
+	path = aw-server-rust
+	url = https://github.com/ActivityWatch/aw-server-rust.git
diff --git a/.travis.yml b/.travis.yml
index b30258d6..657e1d7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,6 +70,9 @@ before_install:
    fi
  # Upgrade pip
  - python3 -m pip install --upgrade pip wheel;
+ # Install Rust
+ - curl https://build.travis-ci.org/files/rustup-init.sh -sSf | sh -s -- -y --default-toolchain nightly
+ - export PATH="$HOME/.cargo/bin:$PATH";
  # Print version used
  - python3 --version
  - pip3 --version
diff --git a/Makefile b/Makefile
index 44bdc94d..4aed9cc8 100644
--- a/Makefile
+++ b/Makefile
@@ -40,11 +40,12 @@ build:
 	make --directory=aw-server build DEV=$(DEV)
 	make --directory=aw-watcher-afk build DEV=$(DEV)
 	make --directory=aw-watcher-window build DEV=$(DEV)
+	make --directory=aw-server-rust build
 	make --directory=aw-qt build DEV=$(DEV)
 #   The below is needed due to: https://github.com/ActivityWatch/activitywatch/issues/173
 	make --directory=aw-client build DEV=$(DEV)
 	make --directory=aw-core build DEV=$(DEV)
-#
+#	Needed to ensure that the server has the correct version set
 	python3 -c "import aw_server; print(aw_server.__version__)"
 
 
@@ -117,6 +118,7 @@ test:
 	make --directory=aw-core test
 	make --directory=aw-client test
 	make --directory=aw-server test
+	make --directory=aw-server-rust test
 	make --directory=aw-qt test
 
 test-integration:
@@ -162,6 +164,10 @@ package:
 #
 	make --directory=aw-server package
 	cp -r aw-server/dist/aw-server dist/activitywatch
+#
+	make --directory=aw-server-rust package
+	mkdir dist/activitywatch/aw-server-rust
+	cp -r aw-server-rust/target/package/* dist/activitywatch/aw-server-rust
 #
 	make --directory=aw-qt package
 	cp -r aw-qt/dist/aw-qt/. dist/activitywatch
diff --git a/aw-client b/aw-client
index 2e11d4b5..6846551b 160000
--- a/aw-client
+++ b/aw-client
@@ -1 +1 @@
-Subproject commit 2e11d4b50484cbe53e37a327eb487f487837f90e
+Subproject commit 6846551b0c91ab37b79435a79e5b2a6bc34d3be6
diff --git a/aw-core b/aw-core
index 4f4b4b24..f43bbf47 160000
--- a/aw-core
+++ b/aw-core
@@ -1 +1 @@
-Subproject commit 4f4b4b241d2d9873c85af81be30ad2770d0d1fc0
+Subproject commit f43bbf47d2f192e1d104babff94e2aa8f9f5f226
diff --git a/aw-qt b/aw-qt
index 565892a6..9d77022c 160000
--- a/aw-qt
+++ b/aw-qt
@@ -1 +1 @@
-Subproject commit 565892a6ef84a2b89eb4166485ec22b874dc785d
+Subproject commit 9d77022ceaa29008dc2b39f34d76526fa972efc5
diff --git a/aw-server b/aw-server
index c2fdfe1f..47a208ba 160000
--- a/aw-server
+++ b/aw-server
@@ -1 +1 @@
-Subproject commit c2fdfe1f3ac85081b45c6780437c61b78f072be0
+Subproject commit 47a208ba513e1e921a7389282757de3455623a36
diff --git a/aw-server-rust b/aw-server-rust
new file mode 160000
index 00000000..b36c4214
--- /dev/null
+++ b/aw-server-rust
@@ -0,0 +1 @@
+Subproject commit b36c421406d0129f1e9bed0cb1dfc90634cb74ed
diff --git a/aw-watcher-window b/aw-watcher-window
index 0c14d77d..d3360ad1 160000
--- a/aw-watcher-window
+++ b/aw-watcher-window
@@ -1 +1 @@
-Subproject commit 0c14d77d338836e2933c0f879914d469e7d93a95
+Subproject commit d3360ad1662b39927a52e8899f915d952f5ec5b5