diff --git a/build.gradle b/build.gradle
index 205642b5ddc596bef7f8ca1338034bc4c8114a79..d2e737cf39505c30cc503abb049a9f232cf01e63 100644
--- a/build.gradle
+++ b/build.gradle
@@ -100,6 +100,49 @@ task downloadCli << {
 	
 }
 
+task downloadCli2 ( type: Exec ) {
+	
+		def dir = workspacePath+'de.prob.core/prob/'
+		delete file(dir)
+	    new File(dir).mkdirs() 
+	
+		['leopard64':'macos','linux':'linux','linux64':'linux64','win32':'windows'].each {
+		def n = it.getKey()
+	
+		def targetdir = dir+it.getValue()
+		def targetzip = dir+"probcli_${n}.zip"
+		def url = "http://nightly.cobra.cs.uni-duesseldorf.de/cli/probcli_${n}.zip"
+		download(url,targetzip)
+	    FileTree zip = zipTree(targetzip)
+	    copy {
+		   from zip
+		   into targetdir
+	    }
+		delete file(targetzip)
+	}
+
+	def targetdir = dir+"windows/"
+	def targetzip = targetdir+"windowslib.zip"
+	download("http://nightly.cobra.cs.uni-duesseldorf.de/cli/windowslib.zip",targetzip)
+	FileTree zip = zipTree(targetzip)
+	    copy {
+		   from zip
+		   into targetdir
+	    }
+	delete file(targetzip)
+			
+	['leopard64':'macos','linux32':'linux','linux64':'linux64'].each {
+	
+		def n = it.getKey()
+		targetdir = dir+it.getValue()
+
+		download( "http://nightly.cobra.cs.uni-duesseldorf.de/cspm/cspm-"+n, targetdir+"/lib/cspm" )
+	}
+	commandLine 'chmod', 'a+x', dir+'linux'+'/lib/cspm', dir+'linux64'+'/lib/cspm', dir+'macos'+'/lib/cspm' 
+	//commandLine 'chmod', 'a+x', dir+'*'+'/cspm' 
+	
+	download( "http://nightly.cobra.cs.uni-duesseldorf.de/cspm/cspm-windows", dir+"windows"+"/lib/cspm.exe" )
+}
 
 completeInstall.dependsOn downloadCli
 completeInstall.dependsOn subprojects.setClassPath
diff --git a/build.gradle~ b/build.gradle~
new file mode 100644
index 0000000000000000000000000000000000000000..107b352a338a9c4157c3210c26c6aee534f6cb5b
--- /dev/null
+++ b/build.gradle~
@@ -0,0 +1,161 @@
+// to trigger a full tycho build please use 'gradle deleteFromClassPath completeInstall'
+
+
+project.ext{
+	
+	targetRepositories = ["http://www.stups.uni-duesseldorf.de/prob_dev_target/","http://download.eclipse.org/releases/indigo/","http://rodin-b-sharp.sourceforge.net/updates"]	
+
+	groupID = "de.prob"
+}
+
+apply from: 'tycho_build.gradle'
+
+// Local tasks
+
+
+task bMotionStudioHelpCustumBuild(type: Exec){
+	
+	commandLine 'ant', '-f','de.bmotionstudio.help/customBuild.xml'
+}
+
+install.dependsOn bMotionStudioHelpCustumBuild
+
+completeInstall.dependsOn bMotionStudioHelpCustumBuild
+
+project(':de.prob.core') {
+
+	repositories {
+		maven {
+		  name "cobra"
+		  url "http://cobra.cs.uni-duesseldorf.de/artifactory/repo"
+		}
+	}
+
+
+	def parser_version = '2.4.8-SNAPSHOT'
+
+	dependencies {
+	 compile group: "de.prob", name: "answerparser", version: parser_version , changing: true
+	 compile group: "de.prob", name: "bparser", version: parser_version , changing: true
+	 compile group: "de.prob", name: "cliparser", version: parser_version , changing: true
+	 compile group: "de.prob", name: "ltlparser", version: parser_version , changing: true
+	 compile group: "de.prob", name: "parserbase", version: parser_version , changing: true
+	 compile group: "de.prob", name: "prologlib", version: parser_version , changing: true
+	 compile group: "de.prob", name: "unicode", version: parser_version , changing: true
+	 compile 'jgrapht:jgrapht:0.8.3'
+	 compile 'commons-lang:commons-lang:2.6'
+	}
+	
+}
+
+project(':de.prob.ui') {
+	repositories {
+		maven {
+		  name "cobra"
+		  url "http://cobra.cs.uni-duesseldorf.de/artifactory/repo"
+		}
+	}
+	dependencies {
+	 	compile 'commons-codec:commons-codec:1.6'
+	}
+}
+
+
+def download(address,target) {
+	    def file = new FileOutputStream(target)
+	    def out = new BufferedOutputStream(file)
+	    out << new URL(address).openStream()
+	    out.close()
+}
+
+task downloadCli << {
+		def dir = workspacePath+'de.prob.core/prob/'
+		delete file(dir)
+	    new File(dir).mkdirs() 
+	
+		['leopard64':'macos','linux':'linux','linux64':'linux64','win32':'windows'].each {
+		def n = it.getKey()
+	
+		def targetdir = dir+it.getValue()
+		def targetzip = dir+"probcli_${n}.zip"
+		def url = "http://nightly.cobra.cs.uni-duesseldorf.de/cli/probcli_${n}.zip"
+		download(url,targetzip)
+	    FileTree zip = zipTree(targetzip)
+	    copy {
+		   from zip
+		   into targetdir
+	    }
+		delete file(targetzip)
+	}
+
+	def targetdir = dir+"windows/"
+	def targetzip = targetdir+"windowslib.zip"
+	download("http://nightly.cobra.cs.uni-duesseldorf.de/cli/windowslib.zip",targetzip)
+	FileTree zip = zipTree(targetzip)
+	    copy {
+		   from zip
+		   into targetdir
+	    }
+	delete file(targetzip)
+	
+}
+
+task downloadCli2 ( type: Exec ) {
+	
+		def dir = workspacePath+'de.prob.core/prob/'
+		delete file(dir)
+	    new File(dir).mkdirs() 
+	
+		['leopard64':'macos','linux':'linux','linux64':'linux64','win32':'windows'].each {
+		def n = it.getKey()
+	
+		def targetdir = dir+it.getValue()
+		def targetzip = dir+"probcli_${n}.zip"
+		def url = "http://nightly.cobra.cs.uni-duesseldorf.de/cli/probcli_${n}.zip"
+		download(url,targetzip)
+	    FileTree zip = zipTree(targetzip)
+	    copy {
+		   from zip
+		   into targetdir
+	    }
+		delete file(targetzip)
+	}
+
+	def targetdir = dir+"windows/"
+	def targetzip = targetdir+"windowslib.zip"
+	download("http://nightly.cobra.cs.uni-duesseldorf.de/cli/windowslib.zip",targetzip)
+	FileTree zip = zipTree(targetzip)
+	    copy {
+		   from zip
+		   into targetdir
+	    }
+	delete file(targetzip)
+			
+	['leopard64':'macos','linux32':'linux','linux64':'linux64'].each {
+	
+		def n = it.getKey()
+		targetdir = dir+it.getValue()
+
+		download( "http://nightly.cobra.cs.uni-duesseldorf.de/cspm/cspm-"+n, targetdir+"/lib/cspm" )
+	}
+	commandLine 'chmod', 'a+x', dir+'linux'+'/cspm', dir+'linux64'+'/cspm', dir+'macos'+'/lib/cspm' 
+	//commandLine 'chmod', 'a+x', dir+'*'+'/cspm' 
+	
+	download( "http://nightly.cobra.cs.uni-duesseldorf.de/cspm/cspm-windows", dir+"windows"+"/lib/cspm.exe" )
+}
+
+completeInstall.dependsOn downloadCli
+completeInstall.dependsOn subprojects.setClassPath
+
+task deleteOldArtifacts(type: Delete) {
+  	String updateSite = workspacePath+'updatesite'
+	delete updateSite
+}
+
+task collectArtifacts(type:Copy) {
+	    from workspacePath + groupID+'.repository/target/repository/'
+	    into workspacePath + 'updatesite'
+	    from workspacePath + "index.html"
+	    into workspacePath + 'updatesite'
+}
+
diff --git a/de.prob.core/.classpath b/de.prob.core/.classpath
index bb1ae0592818db067d6599e1a8f034a51349b613..e34a5d469121e449e52cd6b8606788812d01d31c 100644
--- a/de.prob.core/.classpath
+++ b/de.prob.core/.classpath
@@ -4,20 +4,20 @@
 	<classpathentry exported="true" kind="lib" path="lib/dependencies/xmlpull-1.1.3.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/dependencies/xpp3_min-1.1.4c.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/dependencies/xstream-1.4.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/dependencies/answerparser-2.4.8-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/dependencies/bparser-2.4.8-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/dependencies/cliparser-2.4.8-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/dependencies/commons-lang-2.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/dependencies/jgrapht-0.8.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/dependencies/jsr305-1.3.9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/dependencies/ltlparser-2.4.8-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/dependencies/parserbase-2.4.8-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/dependencies/prologlib-2.4.8-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/dependencies/unicode-2.4.8-SNAPSHOT.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/answerparser-2.4.12-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/bparser-2.4.12-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/cliparser-2.4.12-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/ltlparser-2.4.12-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/parserbase-2.4.12-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/prologlib-2.4.12-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/unicode-2.4.12-SNAPSHOT.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/de.prob.core/src/de/prob/core/command/CSPEvaluateExpressionCommand.java b/de.prob.core/src/de/prob/core/command/CSPEvaluateExpressionCommand.java
new file mode 100644
index 0000000000000000000000000000000000000000..64cce1d6abff167c4a6edd17c21cf7d846bb56e9
--- /dev/null
+++ b/de.prob.core/src/de/prob/core/command/CSPEvaluateExpressionCommand.java
@@ -0,0 +1,5 @@
+package de.prob.core.command;
+
+public class CSPEvaluateExpressionCommand {
+
+}