diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6ac6440
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# Created by .ignore support plugin (hsz.mobi)
+gradle.properties

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6ac6440
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# Created by .ignore support plugin (hsz.mobi)
+gradle.properties
diff --git a/KotlinTest.ipr b/KotlinTest.ipr
index 64ed697..759df4e 100644
--- a/KotlinTest.ipr
+++ b/KotlinTest.ipr
@@ -20,6 +20,7 @@
       </profile>
     </annotationProcessing>
   </component>
+  <component name="CopyrightManager" default="" />
   <component name="Encoding">
     <file url="PROJECT" charset="UTF-8" />
   </component>
@@ -29,13 +30,13 @@
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
       <map>
-        <entry key="$USER_HOME$/Development/DestinationSol" value="5718836739744" />
-        <entry key="$USER_HOME$/Development/simple/Simple-persistence" value="2890201693583" />
-        <entry key="$USER_HOME$/Development/simple/Simple-web" value="2890212261770" />
-        <entry key="$USER_HOME$/Development/simple/SimpleDatabase" value="2890191706466" />
-        <entry key="$USER_HOME$/Development/simple/Very-simple-templates" value="2890190703434" />
-        <entry key="$USER_HOME$/Development/simple/stats/simple-stats-server" value="2909544379158" />
-        <entry key="$USER_HOME$/Development/work/Kos/KosConvertBranchcode" value="2904315467504" />
+        <entry key="$PROJECT_DIR$/../../DestinationSol" value="5718836739744" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-persistence" value="2890201693583" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-web" value="2890212261770" />
+        <entry key="$PROJECT_DIR$/../../simple/SimpleDatabase" value="2890191706466" />
+        <entry key="$PROJECT_DIR$/../../simple/Very-simple-templates" value="2890190703434" />
+        <entry key="$PROJECT_DIR$/../../simple/stats/simple-stats-server" value="2909544379158" />
+        <entry key="$PROJECT_DIR$/../../work/Kos/KosConvertBranchcode" value="2904315467504" />
       </map>
     </option>
     <option name="externalProjectsViewState">

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6ac6440
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# Created by .ignore support plugin (hsz.mobi)
+gradle.properties
diff --git a/KotlinTest.ipr b/KotlinTest.ipr
index 64ed697..759df4e 100644
--- a/KotlinTest.ipr
+++ b/KotlinTest.ipr
@@ -20,6 +20,7 @@
       </profile>
     </annotationProcessing>
   </component>
+  <component name="CopyrightManager" default="" />
   <component name="Encoding">
     <file url="PROJECT" charset="UTF-8" />
   </component>
@@ -29,13 +30,13 @@
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
       <map>
-        <entry key="$USER_HOME$/Development/DestinationSol" value="5718836739744" />
-        <entry key="$USER_HOME$/Development/simple/Simple-persistence" value="2890201693583" />
-        <entry key="$USER_HOME$/Development/simple/Simple-web" value="2890212261770" />
-        <entry key="$USER_HOME$/Development/simple/SimpleDatabase" value="2890191706466" />
-        <entry key="$USER_HOME$/Development/simple/Very-simple-templates" value="2890190703434" />
-        <entry key="$USER_HOME$/Development/simple/stats/simple-stats-server" value="2909544379158" />
-        <entry key="$USER_HOME$/Development/work/Kos/KosConvertBranchcode" value="2904315467504" />
+        <entry key="$PROJECT_DIR$/../../DestinationSol" value="5718836739744" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-persistence" value="2890201693583" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-web" value="2890212261770" />
+        <entry key="$PROJECT_DIR$/../../simple/SimpleDatabase" value="2890191706466" />
+        <entry key="$PROJECT_DIR$/../../simple/Very-simple-templates" value="2890190703434" />
+        <entry key="$PROJECT_DIR$/../../simple/stats/simple-stats-server" value="2909544379158" />
+        <entry key="$PROJECT_DIR$/../../work/Kos/KosConvertBranchcode" value="2904315467504" />
       </map>
     </option>
     <option name="externalProjectsViewState">
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..cf42b8e
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,45 @@
+group 'com.persesgames'
+version '1.0.0-SNAPSHOT'
+
+apply plugin: 'kotlin2js'
+apply plugin: 'kotlin'
+apply plugin: 'idea'
+
+sourceSets {
+    main.kotlin.srcDirs += 'src'
+    main.java.srcDirs += 'src/main/kotlin'
+}
+
+repositories {
+    maven {
+        url "http://nexus.astraeus.nl/nexus/content/groups/public"
+    }
+    mavenCentral()
+}
+
+buildscript {
+    ext.kotlin_version = '1.0.0'
+    repositories {
+        maven {
+            url "http://nexus.astraeus.nl/nexus/content/groups/public"
+        }
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}
+
+compileKotlin2Js {
+    kotlinOptions.metaInfo = true
+
+    compileKotlin2Js.kotlinOptions.sourceMap = true
+    compileKotlin2Js.kotlinOptions.outputFile = "${projectDir}/web/js/generated/KotlinTest.js"
+    compileKotlin2Js.kotlinOptions.suppressWarnings = true
+    compileKotlin2Js.kotlinOptions.verbose = true
+}

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6ac6440
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# Created by .ignore support plugin (hsz.mobi)
+gradle.properties
diff --git a/KotlinTest.ipr b/KotlinTest.ipr
index 64ed697..759df4e 100644
--- a/KotlinTest.ipr
+++ b/KotlinTest.ipr
@@ -20,6 +20,7 @@
       </profile>
     </annotationProcessing>
   </component>
+  <component name="CopyrightManager" default="" />
   <component name="Encoding">
     <file url="PROJECT" charset="UTF-8" />
   </component>
@@ -29,13 +30,13 @@
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
       <map>
-        <entry key="$USER_HOME$/Development/DestinationSol" value="5718836739744" />
-        <entry key="$USER_HOME$/Development/simple/Simple-persistence" value="2890201693583" />
-        <entry key="$USER_HOME$/Development/simple/Simple-web" value="2890212261770" />
-        <entry key="$USER_HOME$/Development/simple/SimpleDatabase" value="2890191706466" />
-        <entry key="$USER_HOME$/Development/simple/Very-simple-templates" value="2890190703434" />
-        <entry key="$USER_HOME$/Development/simple/stats/simple-stats-server" value="2909544379158" />
-        <entry key="$USER_HOME$/Development/work/Kos/KosConvertBranchcode" value="2904315467504" />
+        <entry key="$PROJECT_DIR$/../../DestinationSol" value="5718836739744" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-persistence" value="2890201693583" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-web" value="2890212261770" />
+        <entry key="$PROJECT_DIR$/../../simple/SimpleDatabase" value="2890191706466" />
+        <entry key="$PROJECT_DIR$/../../simple/Very-simple-templates" value="2890190703434" />
+        <entry key="$PROJECT_DIR$/../../simple/stats/simple-stats-server" value="2909544379158" />
+        <entry key="$PROJECT_DIR$/../../work/Kos/KosConvertBranchcode" value="2904315467504" />
       </map>
     </option>
     <option name="externalProjectsViewState">
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..cf42b8e
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,45 @@
+group 'com.persesgames'
+version '1.0.0-SNAPSHOT'
+
+apply plugin: 'kotlin2js'
+apply plugin: 'kotlin'
+apply plugin: 'idea'
+
+sourceSets {
+    main.kotlin.srcDirs += 'src'
+    main.java.srcDirs += 'src/main/kotlin'
+}
+
+repositories {
+    maven {
+        url "http://nexus.astraeus.nl/nexus/content/groups/public"
+    }
+    mavenCentral()
+}
+
+buildscript {
+    ext.kotlin_version = '1.0.0'
+    repositories {
+        maven {
+            url "http://nexus.astraeus.nl/nexus/content/groups/public"
+        }
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}
+
+compileKotlin2Js {
+    kotlinOptions.metaInfo = true
+
+    compileKotlin2Js.kotlinOptions.sourceMap = true
+    compileKotlin2Js.kotlinOptions.outputFile = "${projectDir}/web/js/generated/KotlinTest.js"
+    compileKotlin2Js.kotlinOptions.suppressWarnings = true
+    compileKotlin2Js.kotlinOptions.verbose = true
+}
diff --git a/compile.sh b/compile.sh
new file mode 100755
index 0000000..6f69168
--- /dev/null
+++ b/compile.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+./gradlew compileKotlin2Js
\ No newline at end of file

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6ac6440
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# Created by .ignore support plugin (hsz.mobi)
+gradle.properties
diff --git a/KotlinTest.ipr b/KotlinTest.ipr
index 64ed697..759df4e 100644
--- a/KotlinTest.ipr
+++ b/KotlinTest.ipr
@@ -20,6 +20,7 @@
       </profile>
     </annotationProcessing>
   </component>
+  <component name="CopyrightManager" default="" />
   <component name="Encoding">
     <file url="PROJECT" charset="UTF-8" />
   </component>
@@ -29,13 +30,13 @@
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
       <map>
-        <entry key="$USER_HOME$/Development/DestinationSol" value="5718836739744" />
-        <entry key="$USER_HOME$/Development/simple/Simple-persistence" value="2890201693583" />
-        <entry key="$USER_HOME$/Development/simple/Simple-web" value="2890212261770" />
-        <entry key="$USER_HOME$/Development/simple/SimpleDatabase" value="2890191706466" />
-        <entry key="$USER_HOME$/Development/simple/Very-simple-templates" value="2890190703434" />
-        <entry key="$USER_HOME$/Development/simple/stats/simple-stats-server" value="2909544379158" />
-        <entry key="$USER_HOME$/Development/work/Kos/KosConvertBranchcode" value="2904315467504" />
+        <entry key="$PROJECT_DIR$/../../DestinationSol" value="5718836739744" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-persistence" value="2890201693583" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-web" value="2890212261770" />
+        <entry key="$PROJECT_DIR$/../../simple/SimpleDatabase" value="2890191706466" />
+        <entry key="$PROJECT_DIR$/../../simple/Very-simple-templates" value="2890190703434" />
+        <entry key="$PROJECT_DIR$/../../simple/stats/simple-stats-server" value="2909544379158" />
+        <entry key="$PROJECT_DIR$/../../work/Kos/KosConvertBranchcode" value="2904315467504" />
       </map>
     </option>
     <option name="externalProjectsViewState">
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..cf42b8e
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,45 @@
+group 'com.persesgames'
+version '1.0.0-SNAPSHOT'
+
+apply plugin: 'kotlin2js'
+apply plugin: 'kotlin'
+apply plugin: 'idea'
+
+sourceSets {
+    main.kotlin.srcDirs += 'src'
+    main.java.srcDirs += 'src/main/kotlin'
+}
+
+repositories {
+    maven {
+        url "http://nexus.astraeus.nl/nexus/content/groups/public"
+    }
+    mavenCentral()
+}
+
+buildscript {
+    ext.kotlin_version = '1.0.0'
+    repositories {
+        maven {
+            url "http://nexus.astraeus.nl/nexus/content/groups/public"
+        }
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}
+
+compileKotlin2Js {
+    kotlinOptions.metaInfo = true
+
+    compileKotlin2Js.kotlinOptions.sourceMap = true
+    compileKotlin2Js.kotlinOptions.outputFile = "${projectDir}/web/js/generated/KotlinTest.js"
+    compileKotlin2Js.kotlinOptions.suppressWarnings = true
+    compileKotlin2Js.kotlinOptions.verbose = true
+}
diff --git a/compile.sh b/compile.sh
new file mode 100755
index 0000000..6f69168
--- /dev/null
+++ b/compile.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+./gradlew compileKotlin2Js
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..30d399d
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6ac6440
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# Created by .ignore support plugin (hsz.mobi)
+gradle.properties
diff --git a/KotlinTest.ipr b/KotlinTest.ipr
index 64ed697..759df4e 100644
--- a/KotlinTest.ipr
+++ b/KotlinTest.ipr
@@ -20,6 +20,7 @@
       </profile>
     </annotationProcessing>
   </component>
+  <component name="CopyrightManager" default="" />
   <component name="Encoding">
     <file url="PROJECT" charset="UTF-8" />
   </component>
@@ -29,13 +30,13 @@
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
       <map>
-        <entry key="$USER_HOME$/Development/DestinationSol" value="5718836739744" />
-        <entry key="$USER_HOME$/Development/simple/Simple-persistence" value="2890201693583" />
-        <entry key="$USER_HOME$/Development/simple/Simple-web" value="2890212261770" />
-        <entry key="$USER_HOME$/Development/simple/SimpleDatabase" value="2890191706466" />
-        <entry key="$USER_HOME$/Development/simple/Very-simple-templates" value="2890190703434" />
-        <entry key="$USER_HOME$/Development/simple/stats/simple-stats-server" value="2909544379158" />
-        <entry key="$USER_HOME$/Development/work/Kos/KosConvertBranchcode" value="2904315467504" />
+        <entry key="$PROJECT_DIR$/../../DestinationSol" value="5718836739744" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-persistence" value="2890201693583" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-web" value="2890212261770" />
+        <entry key="$PROJECT_DIR$/../../simple/SimpleDatabase" value="2890191706466" />
+        <entry key="$PROJECT_DIR$/../../simple/Very-simple-templates" value="2890190703434" />
+        <entry key="$PROJECT_DIR$/../../simple/stats/simple-stats-server" value="2909544379158" />
+        <entry key="$PROJECT_DIR$/../../work/Kos/KosConvertBranchcode" value="2904315467504" />
       </map>
     </option>
     <option name="externalProjectsViewState">
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..cf42b8e
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,45 @@
+group 'com.persesgames'
+version '1.0.0-SNAPSHOT'
+
+apply plugin: 'kotlin2js'
+apply plugin: 'kotlin'
+apply plugin: 'idea'
+
+sourceSets {
+    main.kotlin.srcDirs += 'src'
+    main.java.srcDirs += 'src/main/kotlin'
+}
+
+repositories {
+    maven {
+        url "http://nexus.astraeus.nl/nexus/content/groups/public"
+    }
+    mavenCentral()
+}
+
+buildscript {
+    ext.kotlin_version = '1.0.0'
+    repositories {
+        maven {
+            url "http://nexus.astraeus.nl/nexus/content/groups/public"
+        }
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}
+
+compileKotlin2Js {
+    kotlinOptions.metaInfo = true
+
+    compileKotlin2Js.kotlinOptions.sourceMap = true
+    compileKotlin2Js.kotlinOptions.outputFile = "${projectDir}/web/js/generated/KotlinTest.js"
+    compileKotlin2Js.kotlinOptions.suppressWarnings = true
+    compileKotlin2Js.kotlinOptions.verbose = true
+}
diff --git a/compile.sh b/compile.sh
new file mode 100755
index 0000000..6f69168
--- /dev/null
+++ b/compile.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+./gradlew compileKotlin2Js
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..30d399d
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..0515d59
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Oct 20 20:26:54 CEST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6ac6440
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# Created by .ignore support plugin (hsz.mobi)
+gradle.properties
diff --git a/KotlinTest.ipr b/KotlinTest.ipr
index 64ed697..759df4e 100644
--- a/KotlinTest.ipr
+++ b/KotlinTest.ipr
@@ -20,6 +20,7 @@
       </profile>
     </annotationProcessing>
   </component>
+  <component name="CopyrightManager" default="" />
   <component name="Encoding">
     <file url="PROJECT" charset="UTF-8" />
   </component>
@@ -29,13 +30,13 @@
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
       <map>
-        <entry key="$USER_HOME$/Development/DestinationSol" value="5718836739744" />
-        <entry key="$USER_HOME$/Development/simple/Simple-persistence" value="2890201693583" />
-        <entry key="$USER_HOME$/Development/simple/Simple-web" value="2890212261770" />
-        <entry key="$USER_HOME$/Development/simple/SimpleDatabase" value="2890191706466" />
-        <entry key="$USER_HOME$/Development/simple/Very-simple-templates" value="2890190703434" />
-        <entry key="$USER_HOME$/Development/simple/stats/simple-stats-server" value="2909544379158" />
-        <entry key="$USER_HOME$/Development/work/Kos/KosConvertBranchcode" value="2904315467504" />
+        <entry key="$PROJECT_DIR$/../../DestinationSol" value="5718836739744" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-persistence" value="2890201693583" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-web" value="2890212261770" />
+        <entry key="$PROJECT_DIR$/../../simple/SimpleDatabase" value="2890191706466" />
+        <entry key="$PROJECT_DIR$/../../simple/Very-simple-templates" value="2890190703434" />
+        <entry key="$PROJECT_DIR$/../../simple/stats/simple-stats-server" value="2909544379158" />
+        <entry key="$PROJECT_DIR$/../../work/Kos/KosConvertBranchcode" value="2904315467504" />
       </map>
     </option>
     <option name="externalProjectsViewState">
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..cf42b8e
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,45 @@
+group 'com.persesgames'
+version '1.0.0-SNAPSHOT'
+
+apply plugin: 'kotlin2js'
+apply plugin: 'kotlin'
+apply plugin: 'idea'
+
+sourceSets {
+    main.kotlin.srcDirs += 'src'
+    main.java.srcDirs += 'src/main/kotlin'
+}
+
+repositories {
+    maven {
+        url "http://nexus.astraeus.nl/nexus/content/groups/public"
+    }
+    mavenCentral()
+}
+
+buildscript {
+    ext.kotlin_version = '1.0.0'
+    repositories {
+        maven {
+            url "http://nexus.astraeus.nl/nexus/content/groups/public"
+        }
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}
+
+compileKotlin2Js {
+    kotlinOptions.metaInfo = true
+
+    compileKotlin2Js.kotlinOptions.sourceMap = true
+    compileKotlin2Js.kotlinOptions.outputFile = "${projectDir}/web/js/generated/KotlinTest.js"
+    compileKotlin2Js.kotlinOptions.suppressWarnings = true
+    compileKotlin2Js.kotlinOptions.verbose = true
+}
diff --git a/compile.sh b/compile.sh
new file mode 100755
index 0000000..6f69168
--- /dev/null
+++ b/compile.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+./gradlew compileKotlin2Js
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..30d399d
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..0515d59
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Oct 20 20:26:54 CEST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6ac6440
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# Created by .ignore support plugin (hsz.mobi)
+gradle.properties
diff --git a/KotlinTest.ipr b/KotlinTest.ipr
index 64ed697..759df4e 100644
--- a/KotlinTest.ipr
+++ b/KotlinTest.ipr
@@ -20,6 +20,7 @@
       </profile>
     </annotationProcessing>
   </component>
+  <component name="CopyrightManager" default="" />
   <component name="Encoding">
     <file url="PROJECT" charset="UTF-8" />
   </component>
@@ -29,13 +30,13 @@
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
       <map>
-        <entry key="$USER_HOME$/Development/DestinationSol" value="5718836739744" />
-        <entry key="$USER_HOME$/Development/simple/Simple-persistence" value="2890201693583" />
-        <entry key="$USER_HOME$/Development/simple/Simple-web" value="2890212261770" />
-        <entry key="$USER_HOME$/Development/simple/SimpleDatabase" value="2890191706466" />
-        <entry key="$USER_HOME$/Development/simple/Very-simple-templates" value="2890190703434" />
-        <entry key="$USER_HOME$/Development/simple/stats/simple-stats-server" value="2909544379158" />
-        <entry key="$USER_HOME$/Development/work/Kos/KosConvertBranchcode" value="2904315467504" />
+        <entry key="$PROJECT_DIR$/../../DestinationSol" value="5718836739744" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-persistence" value="2890201693583" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-web" value="2890212261770" />
+        <entry key="$PROJECT_DIR$/../../simple/SimpleDatabase" value="2890191706466" />
+        <entry key="$PROJECT_DIR$/../../simple/Very-simple-templates" value="2890190703434" />
+        <entry key="$PROJECT_DIR$/../../simple/stats/simple-stats-server" value="2909544379158" />
+        <entry key="$PROJECT_DIR$/../../work/Kos/KosConvertBranchcode" value="2904315467504" />
       </map>
     </option>
     <option name="externalProjectsViewState">
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..cf42b8e
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,45 @@
+group 'com.persesgames'
+version '1.0.0-SNAPSHOT'
+
+apply plugin: 'kotlin2js'
+apply plugin: 'kotlin'
+apply plugin: 'idea'
+
+sourceSets {
+    main.kotlin.srcDirs += 'src'
+    main.java.srcDirs += 'src/main/kotlin'
+}
+
+repositories {
+    maven {
+        url "http://nexus.astraeus.nl/nexus/content/groups/public"
+    }
+    mavenCentral()
+}
+
+buildscript {
+    ext.kotlin_version = '1.0.0'
+    repositories {
+        maven {
+            url "http://nexus.astraeus.nl/nexus/content/groups/public"
+        }
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}
+
+compileKotlin2Js {
+    kotlinOptions.metaInfo = true
+
+    compileKotlin2Js.kotlinOptions.sourceMap = true
+    compileKotlin2Js.kotlinOptions.outputFile = "${projectDir}/web/js/generated/KotlinTest.js"
+    compileKotlin2Js.kotlinOptions.suppressWarnings = true
+    compileKotlin2Js.kotlinOptions.verbose = true
+}
diff --git a/compile.sh b/compile.sh
new file mode 100755
index 0000000..6f69168
--- /dev/null
+++ b/compile.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+./gradlew compileKotlin2Js
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..30d399d
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..0515d59
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Oct 20 20:26:54 CEST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6ac6440
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# Created by .ignore support plugin (hsz.mobi)
+gradle.properties
diff --git a/KotlinTest.ipr b/KotlinTest.ipr
index 64ed697..759df4e 100644
--- a/KotlinTest.ipr
+++ b/KotlinTest.ipr
@@ -20,6 +20,7 @@
       </profile>
     </annotationProcessing>
   </component>
+  <component name="CopyrightManager" default="" />
   <component name="Encoding">
     <file url="PROJECT" charset="UTF-8" />
   </component>
@@ -29,13 +30,13 @@
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
       <map>
-        <entry key="$USER_HOME$/Development/DestinationSol" value="5718836739744" />
-        <entry key="$USER_HOME$/Development/simple/Simple-persistence" value="2890201693583" />
-        <entry key="$USER_HOME$/Development/simple/Simple-web" value="2890212261770" />
-        <entry key="$USER_HOME$/Development/simple/SimpleDatabase" value="2890191706466" />
-        <entry key="$USER_HOME$/Development/simple/Very-simple-templates" value="2890190703434" />
-        <entry key="$USER_HOME$/Development/simple/stats/simple-stats-server" value="2909544379158" />
-        <entry key="$USER_HOME$/Development/work/Kos/KosConvertBranchcode" value="2904315467504" />
+        <entry key="$PROJECT_DIR$/../../DestinationSol" value="5718836739744" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-persistence" value="2890201693583" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-web" value="2890212261770" />
+        <entry key="$PROJECT_DIR$/../../simple/SimpleDatabase" value="2890191706466" />
+        <entry key="$PROJECT_DIR$/../../simple/Very-simple-templates" value="2890190703434" />
+        <entry key="$PROJECT_DIR$/../../simple/stats/simple-stats-server" value="2909544379158" />
+        <entry key="$PROJECT_DIR$/../../work/Kos/KosConvertBranchcode" value="2904315467504" />
       </map>
     </option>
     <option name="externalProjectsViewState">
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..cf42b8e
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,45 @@
+group 'com.persesgames'
+version '1.0.0-SNAPSHOT'
+
+apply plugin: 'kotlin2js'
+apply plugin: 'kotlin'
+apply plugin: 'idea'
+
+sourceSets {
+    main.kotlin.srcDirs += 'src'
+    main.java.srcDirs += 'src/main/kotlin'
+}
+
+repositories {
+    maven {
+        url "http://nexus.astraeus.nl/nexus/content/groups/public"
+    }
+    mavenCentral()
+}
+
+buildscript {
+    ext.kotlin_version = '1.0.0'
+    repositories {
+        maven {
+            url "http://nexus.astraeus.nl/nexus/content/groups/public"
+        }
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}
+
+compileKotlin2Js {
+    kotlinOptions.metaInfo = true
+
+    compileKotlin2Js.kotlinOptions.sourceMap = true
+    compileKotlin2Js.kotlinOptions.outputFile = "${projectDir}/web/js/generated/KotlinTest.js"
+    compileKotlin2Js.kotlinOptions.suppressWarnings = true
+    compileKotlin2Js.kotlinOptions.verbose = true
+}
diff --git a/compile.sh b/compile.sh
new file mode 100755
index 0000000..6f69168
--- /dev/null
+++ b/compile.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+./gradlew compileKotlin2Js
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..30d399d
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..0515d59
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Oct 20 20:26:54 CEST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..329f712
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'kotlin-webgl-test'

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6ac6440
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# Created by .ignore support plugin (hsz.mobi)
+gradle.properties
diff --git a/KotlinTest.ipr b/KotlinTest.ipr
index 64ed697..759df4e 100644
--- a/KotlinTest.ipr
+++ b/KotlinTest.ipr
@@ -20,6 +20,7 @@
       </profile>
     </annotationProcessing>
   </component>
+  <component name="CopyrightManager" default="" />
   <component name="Encoding">
     <file url="PROJECT" charset="UTF-8" />
   </component>
@@ -29,13 +30,13 @@
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
       <map>
-        <entry key="$USER_HOME$/Development/DestinationSol" value="5718836739744" />
-        <entry key="$USER_HOME$/Development/simple/Simple-persistence" value="2890201693583" />
-        <entry key="$USER_HOME$/Development/simple/Simple-web" value="2890212261770" />
-        <entry key="$USER_HOME$/Development/simple/SimpleDatabase" value="2890191706466" />
-        <entry key="$USER_HOME$/Development/simple/Very-simple-templates" value="2890190703434" />
-        <entry key="$USER_HOME$/Development/simple/stats/simple-stats-server" value="2909544379158" />
-        <entry key="$USER_HOME$/Development/work/Kos/KosConvertBranchcode" value="2904315467504" />
+        <entry key="$PROJECT_DIR$/../../DestinationSol" value="5718836739744" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-persistence" value="2890201693583" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-web" value="2890212261770" />
+        <entry key="$PROJECT_DIR$/../../simple/SimpleDatabase" value="2890191706466" />
+        <entry key="$PROJECT_DIR$/../../simple/Very-simple-templates" value="2890190703434" />
+        <entry key="$PROJECT_DIR$/../../simple/stats/simple-stats-server" value="2909544379158" />
+        <entry key="$PROJECT_DIR$/../../work/Kos/KosConvertBranchcode" value="2904315467504" />
       </map>
     </option>
     <option name="externalProjectsViewState">
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..cf42b8e
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,45 @@
+group 'com.persesgames'
+version '1.0.0-SNAPSHOT'
+
+apply plugin: 'kotlin2js'
+apply plugin: 'kotlin'
+apply plugin: 'idea'
+
+sourceSets {
+    main.kotlin.srcDirs += 'src'
+    main.java.srcDirs += 'src/main/kotlin'
+}
+
+repositories {
+    maven {
+        url "http://nexus.astraeus.nl/nexus/content/groups/public"
+    }
+    mavenCentral()
+}
+
+buildscript {
+    ext.kotlin_version = '1.0.0'
+    repositories {
+        maven {
+            url "http://nexus.astraeus.nl/nexus/content/groups/public"
+        }
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}
+
+compileKotlin2Js {
+    kotlinOptions.metaInfo = true
+
+    compileKotlin2Js.kotlinOptions.sourceMap = true
+    compileKotlin2Js.kotlinOptions.outputFile = "${projectDir}/web/js/generated/KotlinTest.js"
+    compileKotlin2Js.kotlinOptions.suppressWarnings = true
+    compileKotlin2Js.kotlinOptions.verbose = true
+}
diff --git a/compile.sh b/compile.sh
new file mode 100755
index 0000000..6f69168
--- /dev/null
+++ b/compile.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+./gradlew compileKotlin2Js
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..30d399d
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..0515d59
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Oct 20 20:26:54 CEST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..329f712
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'kotlin-webgl-test'
diff --git a/src/com/persesgames/Test.kt b/src/com/persesgames/Test.kt
index 1b9d892..2f5db5e 100644
--- a/src/com/persesgames/Test.kt
+++ b/src/com/persesgames/Test.kt
@@ -24,9 +24,12 @@
     uniform mat4 u_projectionView;
 
     varying vec3 v_color;
+    varying vec2 v_textCoord;
 
     void main(void) {
         v_color = a_color;
+        v_textCoord = a_position.xy;
+
         gl_Position = u_projectionView * vec4(a_position, -1, 1.0);
     }
 """
@@ -34,10 +37,13 @@
 val fragmentShaderSource = """
     precision mediump float;
 
+    uniform sampler2D u_sampler;
+
     varying vec3 v_color;
+    varying vec2 v_textCoord;
 
     void main(void) {
-        gl_FragColor = vec4(v_color, 1.0);
+        gl_FragColor = texture2D(u_sampler, v_textCoord) * vec4(v_color, 1.0);
     }
 """
 
@@ -58,7 +64,6 @@
     var rotZ: Float = 0f;
     var z = -1f;
 
-
     var mMatrix = Matrix4()
     var vMatrix = Matrix4()
     var pMatrix = Matrix4()
@@ -81,9 +86,15 @@
           0f, 1f, 1f, 1f, 0f,
           0f, 0f, 1f, 0f, 0f
           ))
+
+        Textures.load(webgl, "SHIP", "images/ship2.png")
     }
 
     fun update(time: Double) {
+        if (!Textures.ready()) {
+            return
+        }
+
         red = Math.abs(Math.sin(time*0.5)).toFloat()
         green = Math.abs(Math.cos(time*0.3)).toFloat()
         blue = Math.abs(Math.cos(time*0.7)).toFloat()
@@ -97,6 +108,10 @@
     fun render() {
         resize()
 
+        if (!Textures.ready()) {
+            return
+        }
+
         webgl.clearColor(red, green, blue, 1f)
         webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
 
@@ -118,6 +133,11 @@
         mMatrix.mul(pMatrix);
 
         program.begin()
+
+        webgl.activeTexture(WebGLRenderingContext.TEXTURE0)
+        webgl.bindTexture(WebGLRenderingContext.TEXTURE_2D, Textures.get("SHIP"));
+
+        program.setUniform1i("u_sampler", 0)
         program.setUniformMatrix4fv("u_projectionView", mMatrix.getFloat32Array())
         program.queueVertices(triangle)
         program.end()

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6ac6440
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# Created by .ignore support plugin (hsz.mobi)
+gradle.properties
diff --git a/KotlinTest.ipr b/KotlinTest.ipr
index 64ed697..759df4e 100644
--- a/KotlinTest.ipr
+++ b/KotlinTest.ipr
@@ -20,6 +20,7 @@
       </profile>
     </annotationProcessing>
   </component>
+  <component name="CopyrightManager" default="" />
   <component name="Encoding">
     <file url="PROJECT" charset="UTF-8" />
   </component>
@@ -29,13 +30,13 @@
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
       <map>
-        <entry key="$USER_HOME$/Development/DestinationSol" value="5718836739744" />
-        <entry key="$USER_HOME$/Development/simple/Simple-persistence" value="2890201693583" />
-        <entry key="$USER_HOME$/Development/simple/Simple-web" value="2890212261770" />
-        <entry key="$USER_HOME$/Development/simple/SimpleDatabase" value="2890191706466" />
-        <entry key="$USER_HOME$/Development/simple/Very-simple-templates" value="2890190703434" />
-        <entry key="$USER_HOME$/Development/simple/stats/simple-stats-server" value="2909544379158" />
-        <entry key="$USER_HOME$/Development/work/Kos/KosConvertBranchcode" value="2904315467504" />
+        <entry key="$PROJECT_DIR$/../../DestinationSol" value="5718836739744" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-persistence" value="2890201693583" />
+        <entry key="$PROJECT_DIR$/../../simple/Simple-web" value="2890212261770" />
+        <entry key="$PROJECT_DIR$/../../simple/SimpleDatabase" value="2890191706466" />
+        <entry key="$PROJECT_DIR$/../../simple/Very-simple-templates" value="2890190703434" />
+        <entry key="$PROJECT_DIR$/../../simple/stats/simple-stats-server" value="2909544379158" />
+        <entry key="$PROJECT_DIR$/../../work/Kos/KosConvertBranchcode" value="2904315467504" />
       </map>
     </option>
     <option name="externalProjectsViewState">
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..cf42b8e
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,45 @@
+group 'com.persesgames'
+version '1.0.0-SNAPSHOT'
+
+apply plugin: 'kotlin2js'
+apply plugin: 'kotlin'
+apply plugin: 'idea'
+
+sourceSets {
+    main.kotlin.srcDirs += 'src'
+    main.java.srcDirs += 'src/main/kotlin'
+}
+
+repositories {
+    maven {
+        url "http://nexus.astraeus.nl/nexus/content/groups/public"
+    }
+    mavenCentral()
+}
+
+buildscript {
+    ext.kotlin_version = '1.0.0'
+    repositories {
+        maven {
+            url "http://nexus.astraeus.nl/nexus/content/groups/public"
+        }
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}
+
+compileKotlin2Js {
+    kotlinOptions.metaInfo = true
+
+    compileKotlin2Js.kotlinOptions.sourceMap = true
+    compileKotlin2Js.kotlinOptions.outputFile = "${projectDir}/web/js/generated/KotlinTest.js"
+    compileKotlin2Js.kotlinOptions.suppressWarnings = true
+    compileKotlin2Js.kotlinOptions.verbose = true
+}
diff --git a/compile.sh b/compile.sh
new file mode 100755
index 0000000..6f69168
--- /dev/null
+++ b/compile.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+./gradlew compileKotlin2Js
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..30d399d
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..0515d59
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Oct 20 20:26:54 CEST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..329f712
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'kotlin-webgl-test'
diff --git a/src/com/persesgames/Test.kt b/src/com/persesgames/Test.kt
index 1b9d892..2f5db5e 100644
--- a/src/com/persesgames/Test.kt
+++ b/src/com/persesgames/Test.kt
@@ -24,9 +24,12 @@
     uniform mat4 u_projectionView;
 
     varying vec3 v_color;
+    varying vec2 v_textCoord;
 
     void main(void) {
         v_color = a_color;
+        v_textCoord = a_position.xy;
+
         gl_Position = u_projectionView * vec4(a_position, -1, 1.0);
     }
 """
@@ -34,10 +37,13 @@
 val fragmentShaderSource = """
     precision mediump float;
 
+    uniform sampler2D u_sampler;
+
     varying vec3 v_color;
+    varying vec2 v_textCoord;
 
     void main(void) {
-        gl_FragColor = vec4(v_color, 1.0);
+        gl_FragColor = texture2D(u_sampler, v_textCoord) * vec4(v_color, 1.0);
     }
 """
 
@@ -58,7 +64,6 @@
     var rotZ: Float = 0f;
     var z = -1f;
 
-
     var mMatrix = Matrix4()
     var vMatrix = Matrix4()
     var pMatrix = Matrix4()
@@ -81,9 +86,15 @@
           0f, 1f, 1f, 1f, 0f,
           0f, 0f, 1f, 0f, 0f
           ))
+
+        Textures.load(webgl, "SHIP", "images/ship2.png")
     }
 
     fun update(time: Double) {
+        if (!Textures.ready()) {
+            return
+        }
+
         red = Math.abs(Math.sin(time*0.5)).toFloat()
         green = Math.abs(Math.cos(time*0.3)).toFloat()
         blue = Math.abs(Math.cos(time*0.7)).toFloat()
@@ -97,6 +108,10 @@
     fun render() {
         resize()
 
+        if (!Textures.ready()) {
+            return
+        }
+
         webgl.clearColor(red, green, blue, 1f)
         webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
 
@@ -118,6 +133,11 @@
         mMatrix.mul(pMatrix);
 
         program.begin()
+
+        webgl.activeTexture(WebGLRenderingContext.TEXTURE0)
+        webgl.bindTexture(WebGLRenderingContext.TEXTURE_2D, Textures.get("SHIP"));
+
+        program.setUniform1i("u_sampler", 0)
         program.setUniformMatrix4fv("u_projectionView", mMatrix.getFloat32Array())
         program.queueVertices(triangle)
         program.end()
diff --git a/web/js/generated/KotlinTest.js b/web/js/generated/KotlinTest.js
index d9a3e85..0af58ff 100644
--- a/web/js/generated/KotlinTest.js
+++ b/web/js/generated/KotlinTest.js
@@ -3,8 +3,8 @@
   var _ = Kotlin.defineRootPackage(null, /** @lends _ */ {
     com: Kotlin.definePackage(null, /** @lends _.com */ {
       persesgames: Kotlin.definePackage(function () {
-        this.vertexShaderSource = '\n    attribute vec2 a_position;\n    attribute vec3 a_color;\n\n    uniform mat4 u_projectionView;\n\n    varying vec3 v_color;\n\n    void main(void) {\n        v_color = a_color;\n        gl_Position = u_projectionView * vec4(a_position, -1, 1.0);\n    }\n';
-        this.fragmentShaderSource = '\n    precision mediump float;\n\n    varying vec3 v_color;\n\n    void main(void) {\n        gl_FragColor = vec4(v_color, 1.0);\n    }\n';
+        this.vertexShaderSource = '\n    attribute vec2 a_position;\n    attribute vec3 a_color;\n\n    uniform mat4 u_projectionView;\n\n    varying vec3 v_color;\n    varying vec2 v_textCoord;\n\n    void main(void) {\n        v_color = a_color;\n        v_textCoord = a_position.xy;\n\n        gl_Position = u_projectionView * vec4(a_position, -1, 1.0);\n    }\n';
+        this.fragmentShaderSource = '\n    precision mediump float;\n\n    uniform sampler2D u_sampler;\n\n    varying vec3 v_color;\n    varying vec2 v_textCoord;\n\n    void main(void) {\n        gl_FragColor = texture2D(u_sampler, v_textCoord) * vec4(v_color, 1.0);\n    }\n';
         this.game = null;
         this.start = (new Date()).getTime();
         this.time = (new Date()).getTime();
@@ -29,8 +29,12 @@
           var vainfo = [new _.com.persesgames.shader.VertextAttributeInfo('a_position', 2), new _.com.persesgames.shader.VertextAttributeInfo('a_color', 3)];
           this.program = new _.com.persesgames.shader.ShaderProgram(this.webgl, WebGLRenderingContext.TRIANGLES, _.com.persesgames.vertexShaderSource, _.com.persesgames.fragmentShaderSource, vainfo);
           this.triangle = new Float32Array([0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0, 1.0, 1.0, 0.0, 0.0, 1.0, 0.0, 1.0, 1.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0]);
+          _.com.persesgames.texture.Textures.load_h0kzx1$(this.webgl, 'SHIP', 'images/ship2.png');
         }, /** @lends _.com.persesgames.Test.prototype */ {
           update_14dthe$: function (time) {
+            if (!_.com.persesgames.texture.Textures.ready()) {
+              return;
+            }
             this.red = Math.abs(Math.sin(time * 0.5));
             this.green = Math.abs(Math.cos(time * 0.3));
             this.blue = Math.abs(Math.cos(time * 0.7));
@@ -40,6 +44,9 @@
           },
           render: function () {
             this.resize();
+            if (!_.com.persesgames.texture.Textures.ready()) {
+              return;
+            }
             this.webgl.clearColor(this.red, this.green, this.blue, 1.0);
             this.webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT);
             this.mMatrix.setToIdentity();
@@ -53,6 +60,9 @@
             this.mMatrix.mul_jx4e45$(this.vMatrix);
             this.mMatrix.mul_jx4e45$(this.pMatrix);
             this.program.begin();
+            this.webgl.activeTexture(WebGLRenderingContext.TEXTURE0);
+            this.webgl.bindTexture(WebGLRenderingContext.TEXTURE_2D, _.com.persesgames.texture.Textures.get_61zpoe$('SHIP'));
+            this.program.setUniform1i_bm4lxs$('u_sampler', 0);
             this.program.setUniformMatrix4fv_pphpxd$('u_projectionView', this.mMatrix.getFloat32Array());
             this.program.queueVertices_b5uka5$(this.triangle);
             this.program.end();
@@ -96,56 +106,6 @@
           _.com.persesgames.game = new _.com.persesgames.Test(webgl.v);
           _.com.persesgames.loop();
         },
-        texture: Kotlin.definePackage(function () {
-          this.vertexShaderSource = '\n    attribute vec2 a_position;\n\n    attribute float a_imagesX;\n    attribute float a_imagesY;\n    attribute float a_currentImage;\n\n    uniform mat4 u_projectionView;\n\n    varying float v_imagesX;\n    varying float v_imagesY;\n    varying float v_currentImage;\n\n    void main(void) {\n        gl_Position = u_projectionView * vec4(a_position, -1, 1.0);\n        gl_PointSize = 50.0 / gl_Position.w;\n\n        v_imagesX = a_imagesX;\n        v_imagesY = a_imagesY;\n        v_currentImage = a_currentImage;\n    }\n';
-          this.fragmentShaderSource = '\n    precision mediump float;\n\n    uniform sampler2D uSampler;\n\n    varying float v_imagesX;\n    varying float v_imagesY;\n    varying float v_currentImage;\n\n    void main(void) {\n        // calculate current texture coords depending on current image number\n        float blockX = 1.0 / v_imagesX;\n        float blockY = 1.0 / v_imagesY;\n\n        float x = blockX * (mod(v_currentImage, v_imagesX));\n        float y = blockY * floor(v_currentImage / v_imagesY);\n\n        vec2 textCoord = vec2(x + blockX * gl_PointCoord.s, y + blockY - blockY * gl_PointCoord.t);\n        //vec2 textCoord = vec2((x + blockX) * 0.0001 + gl_PointCoord.s, (y + blockY) * 0.0001 + gl_PointCoord.t);\n\n        gl_FragColor = texture2D(uSampler, textCoord);\n    }\n';
-          this.Textures = Kotlin.createObject(null, function () {
-            this.textures = new Kotlin.DefaultPrimitiveHashMap();
-            this.startedLoading = 0;
-            this.loaded = 0;
-          }, {
-            load_h0kzx1$: function (gl, name, filename) {
-              this.startedLoading++;
-              var webGlTexture = {v: gl.createTexture()};
-              if (webGlTexture.v != null) {
-                var image = {v: document.createElement('img')};
-                image.v.onload = _.com.persesgames.texture.load_h0kzx1$f(gl, webGlTexture, image, this, name);
-                image.v.src = filename;
-              }
-               else {
-                Kotlin.println("Couldn't create webgl texture!");
-              }
-            },
-            textureLoaded_ok0n47$: function (gl, texture, image) {
-              gl.bindTexture(WebGLRenderingContext.TEXTURE_2D, texture);
-              gl.pixelStorei(WebGLRenderingContext.UNPACK_FLIP_Y_WEBGL, 1);
-              gl.texImage2D(WebGLRenderingContext.TEXTURE_2D, 0, WebGLRenderingContext.RGBA, WebGLRenderingContext.RGBA, WebGLRenderingContext.UNSIGNED_BYTE, image);
-              gl.texParameteri(WebGLRenderingContext.TEXTURE_2D, WebGLRenderingContext.TEXTURE_MAG_FILTER, WebGLRenderingContext.NEAREST);
-              gl.texParameteri(WebGLRenderingContext.TEXTURE_2D, WebGLRenderingContext.TEXTURE_MIN_FILTER, WebGLRenderingContext.NEAREST);
-              gl.bindTexture(WebGLRenderingContext.TEXTURE_2D, null);
-            },
-            ready: function () {
-              return this.loaded === this.startedLoading;
-            },
-            get_61zpoe$: function (name) {
-              var tmp$0;
-              tmp$0 = this.textures.get_za3rmp$(name);
-              if (tmp$0 == null)
-                throw new Kotlin.IllegalArgumentException('Texture with name ' + name + ' is not loaded!');
-              return tmp$0;
-            },
-            clear: function () {
-            }
-          });
-        }, /** @lends _.com.persesgames.texture */ {
-          load_h0kzx1$f: function (gl, webGlTexture, image, this$Textures, name) {
-            return function (it) {
-              this$Textures.textureLoaded_ok0n47$(gl, webGlTexture.v, image.v);
-              this$Textures.textures.put_wn2jw4$(name, webGlTexture.v);
-              return this$Textures.loaded++;
-            };
-          }
-        }),
         shader: Kotlin.definePackage(null, /** @lends _.com.persesgames.shader */ {
           VertextAttributeInfo: Kotlin.createClass(null, function (locationName, numElements) {
             this.locationName = locationName;
@@ -399,6 +359,56 @@
               this.mul(this.rotateZMatrix_25wv8j$);
             }
           })
+        }),
+        texture: Kotlin.definePackage(function () {
+          this.Textures = Kotlin.createObject(null, function () {
+            this.textures = new Kotlin.DefaultPrimitiveHashMap();
+            this.startedLoading = 0;
+            this.loaded = 0;
+          }, {
+            load_h0kzx1$: function (gl, name, filename) {
+              this.startedLoading++;
+              var webGlTexture = {v: gl.createTexture()};
+              if (webGlTexture.v != null) {
+                var image = {v: document.createElement('img')};
+                image.v.onload = _.com.persesgames.texture.load_h0kzx1$f(gl, webGlTexture, image, this, name);
+                image.v.src = filename;
+              }
+               else {
+                Kotlin.println("Couldn't create webgl texture!");
+              }
+            },
+            textureLoaded_ok0n47$: function (gl, texture, image) {
+              gl.bindTexture(WebGLRenderingContext.TEXTURE_2D, texture);
+              gl.pixelStorei(WebGLRenderingContext.UNPACK_FLIP_Y_WEBGL, 1);
+              gl.texImage2D(WebGLRenderingContext.TEXTURE_2D, 0, WebGLRenderingContext.RGBA, WebGLRenderingContext.RGBA, WebGLRenderingContext.UNSIGNED_BYTE, image);
+              gl.texParameteri(WebGLRenderingContext.TEXTURE_2D, WebGLRenderingContext.TEXTURE_MAG_FILTER, WebGLRenderingContext.NEAREST);
+              gl.texParameteri(WebGLRenderingContext.TEXTURE_2D, WebGLRenderingContext.TEXTURE_MIN_FILTER, WebGLRenderingContext.NEAREST);
+              gl.bindTexture(WebGLRenderingContext.TEXTURE_2D, null);
+            },
+            ready: function () {
+              return this.loaded === this.startedLoading;
+            },
+            get_61zpoe$: function (name) {
+              var tmp$0;
+              tmp$0 = this.textures.get_za3rmp$(name);
+              if (tmp$0 == null)
+                throw new Kotlin.IllegalArgumentException('Texture with name ' + name + ' is not loaded!');
+              return tmp$0;
+            },
+            clear: function () {
+            }
+          });
+          this.vertexShaderSource = '\n    attribute vec2 a_position;\n\n    attribute float a_imagesX;\n    attribute float a_imagesY;\n    attribute float a_currentImage;\n\n    uniform mat4 u_projectionView;\n\n    varying float v_imagesX;\n    varying float v_imagesY;\n    varying float v_currentImage;\n\n    void main(void) {\n        gl_Position = u_projectionView * vec4(a_position, -1, 1.0);\n        gl_PointSize = 50.0 / gl_Position.w;\n\n        v_imagesX = a_imagesX;\n        v_imagesY = a_imagesY;\n        v_currentImage = a_currentImage;\n    }\n';
+          this.fragmentShaderSource = '\n    precision mediump float;\n\n    uniform sampler2D uSampler;\n\n    varying float v_imagesX;\n    varying float v_imagesY;\n    varying float v_currentImage;\n\n    void main(void) {\n        // calculate current texture coords depending on current image number\n        float blockX = 1.0 / v_imagesX;\n        float blockY = 1.0 / v_imagesY;\n\n        float x = blockX * (mod(v_currentImage, v_imagesX));\n        float y = blockY * floor(v_currentImage / v_imagesY);\n\n        vec2 textCoord = vec2(x + blockX * gl_PointCoord.s, y + blockY - blockY * gl_PointCoord.t);\n        //vec2 textCoord = vec2((x + blockX) * 0.0001 + gl_PointCoord.s, (y + blockY) * 0.0001 + gl_PointCoord.t);\n\n        gl_FragColor = texture2D(uSampler, textCoord);\n    }\n';
+        }, /** @lends _.com.persesgames.texture */ {
+          load_h0kzx1$f: function (gl, webGlTexture, image, this$Textures, name) {
+            return function (it) {
+              this$Textures.textureLoaded_ok0n47$(gl, webGlTexture.v, image.v);
+              this$Textures.textures.put_wn2jw4$(name, webGlTexture.v);
+              return this$Textures.loaded++;
+            };
+          }
         })
       })
     })