diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index 066c775f9..1ae161eba 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -404,6 +404,30 @@ jobs:
       params: 
         file: out/vscode-manifest-yaml-*.vsix
         acl: public-read
+- name: build-boot-vsix-snapshot
+  # This job is not yet properly / fully implemented. It only builds language-server-jar
+  plan:
+  - aggregate:
+    - get: sts4
+      trigger: true
+    - get: maven-cache
+  - task: build-language-server-jar
+    config:
+      inputs:
+      - name: sts4
+      platform: linux
+      image_resource:
+        type: docker-image
+        source:
+          repository: kdvolder/sts4-build-env
+      run:
+        dir: sts4/headless-services/boot-language-server
+        path: ./build.sh
+    on_failure:
+      put: slack-notification
+      params:
+        text: |
+           Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed!
 - name: trigger-rc-build
   serial: true
   plan: 
@@ -1138,6 +1162,7 @@ groups:
   - build-vscode-snapshot-website
   - build-consourse-vsix-snapshot
   - build-boot-properties-vsix-snapshot
+  - build-boot-vsix-snapshot
   - build-boot-java-vsix-snapshot
   - build-bosh-vsix-snapshot
   - build-manifest-yaml-vsix-snapshot
diff --git a/headless-services/boot-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java b/headless-services/boot-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java
new file mode 100644
index 000000000..9f3332e93
--- /dev/null
+++ b/headless-services/boot-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2017 Pivotal, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Pivotal, Inc. - initial API and implementation
+ *******************************************************************************/
+package org.springframework.ide.vscode.boot;
+
+import java.io.IOException;
+
+import org.springframework.ide.vscode.commons.languageserver.LaunguageServerApp;
+import org.springframework.ide.vscode.commons.util.LogRedirect;
+
+/**
+ * Starts up Language Server process
+ * 
+ * @author Alex Boyko
+ * @author Kris De Volder
+ *
+ */
+public class Main {
+		
+	public static void main(String[] args) throws IOException, InterruptedException {
+		String serverName = "boot-language-server";
+		LogRedirect.redirectToFile(serverName);
+		//TODO: wrap both BootProperties and BootJavaLanguageServers into a composite of some kind.
+		LaunguageServerApp.start(serverName,
+				() -> new BootPropertiesLanguageServer(BootPropertiesLanguageServerParams.createDefault()));
+	}
+
+}