diff --git a/KotlinTest.iml b/KotlinTest.iml
index f6bea00..427707b 100644
--- a/KotlinTest.iml
+++ b/KotlinTest.iml
@@ -3,8 +3,8 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/lib/kotludens" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/KotlinTest.iml b/KotlinTest.iml
index f6bea00..427707b 100644
--- a/KotlinTest.iml
+++ b/KotlinTest.iml
@@ -3,8 +3,8 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/lib/kotludens" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/KotlinTest.ipr b/KotlinTest.ipr
index 5e0b3c1..b8e3748 100644
--- a/KotlinTest.ipr
+++ b/KotlinTest.ipr
@@ -30,13 +30,13 @@
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
       <map>
-        <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" />
+        <entry key="$USER_HOME$/DestinationSol" value="5718836739744" />
+        <entry key="$USER_HOME$/simple/Simple-persistence" value="2890201693583" />
+        <entry key="$USER_HOME$/simple/Simple-web" value="2890212261770" />
+        <entry key="$USER_HOME$/simple/SimpleDatabase" value="2890191706466" />
+        <entry key="$USER_HOME$/simple/Very-simple-templates" value="2890190703434" />
+        <entry key="$USER_HOME$/simple/stats/simple-stats-server" value="2909544379158" />
+        <entry key="$USER_HOME$/work/Kos/KosConvertBranchcode" value="2904315467504" />
       </map>
     </option>
     <option name="externalProjectsViewState">
@@ -74,6 +74,17 @@
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
+  <component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="GenerateJS" type="K2JSConfigurationType" factoryName="Kotlin (JavaScript - experimental)">
+      <K2JSConfigurationSettings>
+        <option name="browserFamily" value="Chrome" />
+        <option name="generatedFilePath" value="$PROJECT_DIR$/web/js/generated" />
+        <option name="pageToOpenFilePath" value="" />
+        <option name="shouldOpenInBrowserAfterTranslation" value="false" />
+      </K2JSConfigurationSettings>
+      <method />
+    </configuration>
+  </component>
   <component name="PropertiesComponent">
     <property name="GoToClass.includeLibraries" value="false" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />

diff --git a/KotlinTest.iml b/KotlinTest.iml
index f6bea00..427707b 100644
--- a/KotlinTest.iml
+++ b/KotlinTest.iml
@@ -3,8 +3,8 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/lib/kotludens" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/KotlinTest.ipr b/KotlinTest.ipr
index 5e0b3c1..b8e3748 100644
--- a/KotlinTest.ipr
+++ b/KotlinTest.ipr
@@ -30,13 +30,13 @@
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
       <map>
-        <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" />
+        <entry key="$USER_HOME$/DestinationSol" value="5718836739744" />
+        <entry key="$USER_HOME$/simple/Simple-persistence" value="2890201693583" />
+        <entry key="$USER_HOME$/simple/Simple-web" value="2890212261770" />
+        <entry key="$USER_HOME$/simple/SimpleDatabase" value="2890191706466" />
+        <entry key="$USER_HOME$/simple/Very-simple-templates" value="2890190703434" />
+        <entry key="$USER_HOME$/simple/stats/simple-stats-server" value="2909544379158" />
+        <entry key="$USER_HOME$/work/Kos/KosConvertBranchcode" value="2904315467504" />
       </map>
     </option>
     <option name="externalProjectsViewState">
@@ -74,6 +74,17 @@
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
+  <component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="GenerateJS" type="K2JSConfigurationType" factoryName="Kotlin (JavaScript - experimental)">
+      <K2JSConfigurationSettings>
+        <option name="browserFamily" value="Chrome" />
+        <option name="generatedFilePath" value="$PROJECT_DIR$/web/js/generated" />
+        <option name="pageToOpenFilePath" value="" />
+        <option name="shouldOpenInBrowserAfterTranslation" value="false" />
+      </K2JSConfigurationSettings>
+      <method />
+    </configuration>
+  </component>
   <component name="PropertiesComponent">
     <property name="GoToClass.includeLibraries" value="false" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
diff --git a/lib/kotludens/com/persesgames/game/Game.kt b/lib/kotludens/com/persesgames/game/Game.kt
index ba9cd14..3b083d3 100644
--- a/lib/kotludens/com/persesgames/game/Game.kt
+++ b/lib/kotludens/com/persesgames/game/Game.kt
@@ -1,8 +1,6 @@
 package com.persesgames.game
 
-import com.persesgames.game
 import com.persesgames.texture.Textures
-import com.persesgames.time
 import org.khronos.webgl.WebGLRenderingContext
 import org.w3c.dom.HTMLCanvasElement
 import kotlin.browser.document
@@ -16,27 +14,25 @@
     override fun update(time: Float) {
     }
 
-    override fun render(webgl: WebGLRenderingContext) {
+    override fun render() {
         // show loading  message?
+        Game.webgl.clearColor(1f, 1f, 0f, 1f)
+        Game.webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
     }
 }
 
-open class Game(var currentScreen: Screen) {
-    val webgl: WebGLRenderingContext
+object Game {
+    var started = false
+    val webgl: WebGLRenderingContext by lazy {
+        var canvas = document.createElement("canvas") as HTMLCanvasElement
+        document.body!!.appendChild(canvas)
+        canvas.getContext("webgl") as WebGLRenderingContext
+    }
+    var currentScreen: Screen = DefaultScreen()
     var start = Date().getTime()
     var currentTime = start
     var currentDelta = 0f
 
-    init {
-        var canvas = document.createElement("canvas") as HTMLCanvasElement
-        document.body!!.appendChild(canvas)
-        webgl = canvas.getContext("webgl") as WebGLRenderingContext
-
-        resize()
-
-        currentScreen.loadResources()
-    }
-
     fun resize() {
         var canvas = webgl.canvas
         // Check if the canvas is not the same size.
@@ -51,12 +47,19 @@
         }
     }
 
-    fun start() {
+    fun start(startScreen: Screen) {
+        if (started) {
+            throw IllegalStateException("You can only start a game once!")
+        }
+
+        setScreen(startScreen)
+
         // start game loop
+        started = true
         gameLoop()
     }
 
-    open fun setScreen(screen: Screen) {
+    fun setScreen(screen: Screen) {
         currentScreen.closeResources()
 
         currentScreen = screen
@@ -66,21 +69,17 @@
 
     fun gameLoop() {
         if (!Textures.ready()) {
-            return;
-        }
+            Game.webgl.clearColor(1f, 0f, 0f, 1f)
+            Game.webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
+        } else {
+            resize();
 
-        var time = Date().getTime()
-        currentDelta = (currentTime - time) / 1000f
-        currentTime = time
+            var time = Date().getTime()
+            currentDelta = (currentTime - time) / 1000f
+            currentTime = time
 
-        currentScreen.update(currentDelta);
-        currentScreen.render(webgl);
-
-        var testInstance = game
-        if (testInstance != null) {
-            time = Date().getTime()
-            testInstance.update((time - com.persesgames.start) / 1000.0)
-            testInstance.render()
+            currentScreen.update(currentDelta);
+            currentScreen.render();
         }
 
         window.requestAnimationFrame {

diff --git a/KotlinTest.iml b/KotlinTest.iml
index f6bea00..427707b 100644
--- a/KotlinTest.iml
+++ b/KotlinTest.iml
@@ -3,8 +3,8 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/lib/kotludens" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/KotlinTest.ipr b/KotlinTest.ipr
index 5e0b3c1..b8e3748 100644
--- a/KotlinTest.ipr
+++ b/KotlinTest.ipr
@@ -30,13 +30,13 @@
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
       <map>
-        <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" />
+        <entry key="$USER_HOME$/DestinationSol" value="5718836739744" />
+        <entry key="$USER_HOME$/simple/Simple-persistence" value="2890201693583" />
+        <entry key="$USER_HOME$/simple/Simple-web" value="2890212261770" />
+        <entry key="$USER_HOME$/simple/SimpleDatabase" value="2890191706466" />
+        <entry key="$USER_HOME$/simple/Very-simple-templates" value="2890190703434" />
+        <entry key="$USER_HOME$/simple/stats/simple-stats-server" value="2909544379158" />
+        <entry key="$USER_HOME$/work/Kos/KosConvertBranchcode" value="2904315467504" />
       </map>
     </option>
     <option name="externalProjectsViewState">
@@ -74,6 +74,17 @@
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
+  <component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="GenerateJS" type="K2JSConfigurationType" factoryName="Kotlin (JavaScript - experimental)">
+      <K2JSConfigurationSettings>
+        <option name="browserFamily" value="Chrome" />
+        <option name="generatedFilePath" value="$PROJECT_DIR$/web/js/generated" />
+        <option name="pageToOpenFilePath" value="" />
+        <option name="shouldOpenInBrowserAfterTranslation" value="false" />
+      </K2JSConfigurationSettings>
+      <method />
+    </configuration>
+  </component>
   <component name="PropertiesComponent">
     <property name="GoToClass.includeLibraries" value="false" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
diff --git a/lib/kotludens/com/persesgames/game/Game.kt b/lib/kotludens/com/persesgames/game/Game.kt
index ba9cd14..3b083d3 100644
--- a/lib/kotludens/com/persesgames/game/Game.kt
+++ b/lib/kotludens/com/persesgames/game/Game.kt
@@ -1,8 +1,6 @@
 package com.persesgames.game
 
-import com.persesgames.game
 import com.persesgames.texture.Textures
-import com.persesgames.time
 import org.khronos.webgl.WebGLRenderingContext
 import org.w3c.dom.HTMLCanvasElement
 import kotlin.browser.document
@@ -16,27 +14,25 @@
     override fun update(time: Float) {
     }
 
-    override fun render(webgl: WebGLRenderingContext) {
+    override fun render() {
         // show loading  message?
+        Game.webgl.clearColor(1f, 1f, 0f, 1f)
+        Game.webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
     }
 }
 
-open class Game(var currentScreen: Screen) {
-    val webgl: WebGLRenderingContext
+object Game {
+    var started = false
+    val webgl: WebGLRenderingContext by lazy {
+        var canvas = document.createElement("canvas") as HTMLCanvasElement
+        document.body!!.appendChild(canvas)
+        canvas.getContext("webgl") as WebGLRenderingContext
+    }
+    var currentScreen: Screen = DefaultScreen()
     var start = Date().getTime()
     var currentTime = start
     var currentDelta = 0f
 
-    init {
-        var canvas = document.createElement("canvas") as HTMLCanvasElement
-        document.body!!.appendChild(canvas)
-        webgl = canvas.getContext("webgl") as WebGLRenderingContext
-
-        resize()
-
-        currentScreen.loadResources()
-    }
-
     fun resize() {
         var canvas = webgl.canvas
         // Check if the canvas is not the same size.
@@ -51,12 +47,19 @@
         }
     }
 
-    fun start() {
+    fun start(startScreen: Screen) {
+        if (started) {
+            throw IllegalStateException("You can only start a game once!")
+        }
+
+        setScreen(startScreen)
+
         // start game loop
+        started = true
         gameLoop()
     }
 
-    open fun setScreen(screen: Screen) {
+    fun setScreen(screen: Screen) {
         currentScreen.closeResources()
 
         currentScreen = screen
@@ -66,21 +69,17 @@
 
     fun gameLoop() {
         if (!Textures.ready()) {
-            return;
-        }
+            Game.webgl.clearColor(1f, 0f, 0f, 1f)
+            Game.webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
+        } else {
+            resize();
 
-        var time = Date().getTime()
-        currentDelta = (currentTime - time) / 1000f
-        currentTime = time
+            var time = Date().getTime()
+            currentDelta = (currentTime - time) / 1000f
+            currentTime = time
 
-        currentScreen.update(currentDelta);
-        currentScreen.render(webgl);
-
-        var testInstance = game
-        if (testInstance != null) {
-            time = Date().getTime()
-            testInstance.update((time - com.persesgames.start) / 1000.0)
-            testInstance.render()
+            currentScreen.update(currentDelta);
+            currentScreen.render();
         }
 
         window.requestAnimationFrame {
diff --git a/lib/kotludens/com/persesgames/game/Screen.kt b/lib/kotludens/com/persesgames/game/Screen.kt
index 572f797..403d7a7 100644
--- a/lib/kotludens/com/persesgames/game/Screen.kt
+++ b/lib/kotludens/com/persesgames/game/Screen.kt
@@ -17,6 +17,6 @@
 
     abstract fun update(time: Float)
 
-    abstract fun render(webgl: WebGLRenderingContext)
+    abstract fun render()
 
 }

diff --git a/KotlinTest.iml b/KotlinTest.iml
index f6bea00..427707b 100644
--- a/KotlinTest.iml
+++ b/KotlinTest.iml
@@ -3,8 +3,8 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/lib/kotludens" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/KotlinTest.ipr b/KotlinTest.ipr
index 5e0b3c1..b8e3748 100644
--- a/KotlinTest.ipr
+++ b/KotlinTest.ipr
@@ -30,13 +30,13 @@
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
       <map>
-        <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" />
+        <entry key="$USER_HOME$/DestinationSol" value="5718836739744" />
+        <entry key="$USER_HOME$/simple/Simple-persistence" value="2890201693583" />
+        <entry key="$USER_HOME$/simple/Simple-web" value="2890212261770" />
+        <entry key="$USER_HOME$/simple/SimpleDatabase" value="2890191706466" />
+        <entry key="$USER_HOME$/simple/Very-simple-templates" value="2890190703434" />
+        <entry key="$USER_HOME$/simple/stats/simple-stats-server" value="2909544379158" />
+        <entry key="$USER_HOME$/work/Kos/KosConvertBranchcode" value="2904315467504" />
       </map>
     </option>
     <option name="externalProjectsViewState">
@@ -74,6 +74,17 @@
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
+  <component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="GenerateJS" type="K2JSConfigurationType" factoryName="Kotlin (JavaScript - experimental)">
+      <K2JSConfigurationSettings>
+        <option name="browserFamily" value="Chrome" />
+        <option name="generatedFilePath" value="$PROJECT_DIR$/web/js/generated" />
+        <option name="pageToOpenFilePath" value="" />
+        <option name="shouldOpenInBrowserAfterTranslation" value="false" />
+      </K2JSConfigurationSettings>
+      <method />
+    </configuration>
+  </component>
   <component name="PropertiesComponent">
     <property name="GoToClass.includeLibraries" value="false" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
diff --git a/lib/kotludens/com/persesgames/game/Game.kt b/lib/kotludens/com/persesgames/game/Game.kt
index ba9cd14..3b083d3 100644
--- a/lib/kotludens/com/persesgames/game/Game.kt
+++ b/lib/kotludens/com/persesgames/game/Game.kt
@@ -1,8 +1,6 @@
 package com.persesgames.game
 
-import com.persesgames.game
 import com.persesgames.texture.Textures
-import com.persesgames.time
 import org.khronos.webgl.WebGLRenderingContext
 import org.w3c.dom.HTMLCanvasElement
 import kotlin.browser.document
@@ -16,27 +14,25 @@
     override fun update(time: Float) {
     }
 
-    override fun render(webgl: WebGLRenderingContext) {
+    override fun render() {
         // show loading  message?
+        Game.webgl.clearColor(1f, 1f, 0f, 1f)
+        Game.webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
     }
 }
 
-open class Game(var currentScreen: Screen) {
-    val webgl: WebGLRenderingContext
+object Game {
+    var started = false
+    val webgl: WebGLRenderingContext by lazy {
+        var canvas = document.createElement("canvas") as HTMLCanvasElement
+        document.body!!.appendChild(canvas)
+        canvas.getContext("webgl") as WebGLRenderingContext
+    }
+    var currentScreen: Screen = DefaultScreen()
     var start = Date().getTime()
     var currentTime = start
     var currentDelta = 0f
 
-    init {
-        var canvas = document.createElement("canvas") as HTMLCanvasElement
-        document.body!!.appendChild(canvas)
-        webgl = canvas.getContext("webgl") as WebGLRenderingContext
-
-        resize()
-
-        currentScreen.loadResources()
-    }
-
     fun resize() {
         var canvas = webgl.canvas
         // Check if the canvas is not the same size.
@@ -51,12 +47,19 @@
         }
     }
 
-    fun start() {
+    fun start(startScreen: Screen) {
+        if (started) {
+            throw IllegalStateException("You can only start a game once!")
+        }
+
+        setScreen(startScreen)
+
         // start game loop
+        started = true
         gameLoop()
     }
 
-    open fun setScreen(screen: Screen) {
+    fun setScreen(screen: Screen) {
         currentScreen.closeResources()
 
         currentScreen = screen
@@ -66,21 +69,17 @@
 
     fun gameLoop() {
         if (!Textures.ready()) {
-            return;
-        }
+            Game.webgl.clearColor(1f, 0f, 0f, 1f)
+            Game.webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
+        } else {
+            resize();
 
-        var time = Date().getTime()
-        currentDelta = (currentTime - time) / 1000f
-        currentTime = time
+            var time = Date().getTime()
+            currentDelta = (currentTime - time) / 1000f
+            currentTime = time
 
-        currentScreen.update(currentDelta);
-        currentScreen.render(webgl);
-
-        var testInstance = game
-        if (testInstance != null) {
-            time = Date().getTime()
-            testInstance.update((time - com.persesgames.start) / 1000.0)
-            testInstance.render()
+            currentScreen.update(currentDelta);
+            currentScreen.render();
         }
 
         window.requestAnimationFrame {
diff --git a/lib/kotludens/com/persesgames/game/Screen.kt b/lib/kotludens/com/persesgames/game/Screen.kt
index 572f797..403d7a7 100644
--- a/lib/kotludens/com/persesgames/game/Screen.kt
+++ b/lib/kotludens/com/persesgames/game/Screen.kt
@@ -17,6 +17,6 @@
 
     abstract fun update(time: Float)
 
-    abstract fun render(webgl: WebGLRenderingContext)
+    abstract fun render()
 
 }
diff --git a/lib/kotludens/com/persesgames/sprite/SpriteBatch.kt b/lib/kotludens/com/persesgames/sprite/SpriteBatch.kt
new file mode 100644
index 0000000..fff7e75
--- /dev/null
+++ b/lib/kotludens/com/persesgames/sprite/SpriteBatch.kt
@@ -0,0 +1,11 @@
+package com.persesgames.sprite
+
+/**
+ * User: rnentjes
+ * Date: 20-4-16
+ * Time: 13:48
+ */
+class SpriteBatch {
+
+
+}

diff --git a/KotlinTest.iml b/KotlinTest.iml
index f6bea00..427707b 100644
--- a/KotlinTest.iml
+++ b/KotlinTest.iml
@@ -3,8 +3,8 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/lib/kotludens" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/KotlinTest.ipr b/KotlinTest.ipr
index 5e0b3c1..b8e3748 100644
--- a/KotlinTest.ipr
+++ b/KotlinTest.ipr
@@ -30,13 +30,13 @@
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
       <map>
-        <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" />
+        <entry key="$USER_HOME$/DestinationSol" value="5718836739744" />
+        <entry key="$USER_HOME$/simple/Simple-persistence" value="2890201693583" />
+        <entry key="$USER_HOME$/simple/Simple-web" value="2890212261770" />
+        <entry key="$USER_HOME$/simple/SimpleDatabase" value="2890191706466" />
+        <entry key="$USER_HOME$/simple/Very-simple-templates" value="2890190703434" />
+        <entry key="$USER_HOME$/simple/stats/simple-stats-server" value="2909544379158" />
+        <entry key="$USER_HOME$/work/Kos/KosConvertBranchcode" value="2904315467504" />
       </map>
     </option>
     <option name="externalProjectsViewState">
@@ -74,6 +74,17 @@
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
+  <component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="GenerateJS" type="K2JSConfigurationType" factoryName="Kotlin (JavaScript - experimental)">
+      <K2JSConfigurationSettings>
+        <option name="browserFamily" value="Chrome" />
+        <option name="generatedFilePath" value="$PROJECT_DIR$/web/js/generated" />
+        <option name="pageToOpenFilePath" value="" />
+        <option name="shouldOpenInBrowserAfterTranslation" value="false" />
+      </K2JSConfigurationSettings>
+      <method />
+    </configuration>
+  </component>
   <component name="PropertiesComponent">
     <property name="GoToClass.includeLibraries" value="false" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
diff --git a/lib/kotludens/com/persesgames/game/Game.kt b/lib/kotludens/com/persesgames/game/Game.kt
index ba9cd14..3b083d3 100644
--- a/lib/kotludens/com/persesgames/game/Game.kt
+++ b/lib/kotludens/com/persesgames/game/Game.kt
@@ -1,8 +1,6 @@
 package com.persesgames.game
 
-import com.persesgames.game
 import com.persesgames.texture.Textures
-import com.persesgames.time
 import org.khronos.webgl.WebGLRenderingContext
 import org.w3c.dom.HTMLCanvasElement
 import kotlin.browser.document
@@ -16,27 +14,25 @@
     override fun update(time: Float) {
     }
 
-    override fun render(webgl: WebGLRenderingContext) {
+    override fun render() {
         // show loading  message?
+        Game.webgl.clearColor(1f, 1f, 0f, 1f)
+        Game.webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
     }
 }
 
-open class Game(var currentScreen: Screen) {
-    val webgl: WebGLRenderingContext
+object Game {
+    var started = false
+    val webgl: WebGLRenderingContext by lazy {
+        var canvas = document.createElement("canvas") as HTMLCanvasElement
+        document.body!!.appendChild(canvas)
+        canvas.getContext("webgl") as WebGLRenderingContext
+    }
+    var currentScreen: Screen = DefaultScreen()
     var start = Date().getTime()
     var currentTime = start
     var currentDelta = 0f
 
-    init {
-        var canvas = document.createElement("canvas") as HTMLCanvasElement
-        document.body!!.appendChild(canvas)
-        webgl = canvas.getContext("webgl") as WebGLRenderingContext
-
-        resize()
-
-        currentScreen.loadResources()
-    }
-
     fun resize() {
         var canvas = webgl.canvas
         // Check if the canvas is not the same size.
@@ -51,12 +47,19 @@
         }
     }
 
-    fun start() {
+    fun start(startScreen: Screen) {
+        if (started) {
+            throw IllegalStateException("You can only start a game once!")
+        }
+
+        setScreen(startScreen)
+
         // start game loop
+        started = true
         gameLoop()
     }
 
-    open fun setScreen(screen: Screen) {
+    fun setScreen(screen: Screen) {
         currentScreen.closeResources()
 
         currentScreen = screen
@@ -66,21 +69,17 @@
 
     fun gameLoop() {
         if (!Textures.ready()) {
-            return;
-        }
+            Game.webgl.clearColor(1f, 0f, 0f, 1f)
+            Game.webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
+        } else {
+            resize();
 
-        var time = Date().getTime()
-        currentDelta = (currentTime - time) / 1000f
-        currentTime = time
+            var time = Date().getTime()
+            currentDelta = (currentTime - time) / 1000f
+            currentTime = time
 
-        currentScreen.update(currentDelta);
-        currentScreen.render(webgl);
-
-        var testInstance = game
-        if (testInstance != null) {
-            time = Date().getTime()
-            testInstance.update((time - com.persesgames.start) / 1000.0)
-            testInstance.render()
+            currentScreen.update(currentDelta);
+            currentScreen.render();
         }
 
         window.requestAnimationFrame {
diff --git a/lib/kotludens/com/persesgames/game/Screen.kt b/lib/kotludens/com/persesgames/game/Screen.kt
index 572f797..403d7a7 100644
--- a/lib/kotludens/com/persesgames/game/Screen.kt
+++ b/lib/kotludens/com/persesgames/game/Screen.kt
@@ -17,6 +17,6 @@
 
     abstract fun update(time: Float)
 
-    abstract fun render(webgl: WebGLRenderingContext)
+    abstract fun render()
 
 }
diff --git a/lib/kotludens/com/persesgames/sprite/SpriteBatch.kt b/lib/kotludens/com/persesgames/sprite/SpriteBatch.kt
new file mode 100644
index 0000000..fff7e75
--- /dev/null
+++ b/lib/kotludens/com/persesgames/sprite/SpriteBatch.kt
@@ -0,0 +1,11 @@
+package com.persesgames.sprite
+
+/**
+ * User: rnentjes
+ * Date: 20-4-16
+ * Time: 13:48
+ */
+class SpriteBatch {
+
+
+}
diff --git a/lib/kotludens/com/persesgames/texture/Textures.kt b/lib/kotludens/com/persesgames/texture/Textures.kt
index 79e26a8..6e6f788 100644
--- a/lib/kotludens/com/persesgames/texture/Textures.kt
+++ b/lib/kotludens/com/persesgames/texture/Textures.kt
@@ -1,5 +1,6 @@
 package com.persesgames.texture
 
+import com.persesgames.game.Game
 import org.khronos.webgl.WebGLRenderingContext
 import org.khronos.webgl.WebGLTexture
 import org.w3c.dom.HTMLImageElement
@@ -12,30 +13,42 @@
  * Time: 14:52
  */
 
+class Texture(val glTexture: WebGLTexture) {
+
+}
+
 object Textures {
     var textures = HashMap<String, WebGLTexture>();
     var startedLoading = 0
     var loaded = 0
 
-    fun load(gl: WebGLRenderingContext, name: String, filename: String) {
+    fun loadSpriteSheet(name: String, filename: String) {
+
+    }
+
+    fun load(name: String, filename: String) {
+        var gl = Game.webgl
+
         startedLoading++
 
         var webGlTexture = gl.createTexture()
         if (webGlTexture != null) {
             var image = document.createElement("img") as HTMLImageElement
             image.onload = {
-                textureLoaded(gl, webGlTexture, image)
+                textureLoaded(webGlTexture, image)
                 textures.put(name, webGlTexture)
                 loaded++
+                println("loaded texture $loaded/$startedLoading ${ready()}")
             }
             image.src = filename
         } else {
-            println("Couldn't create webgl texture!")
+            throw IllegalStateException("Couldn't create webgl texture!")
         }
-
     }
 
-    fun textureLoaded(gl: WebGLRenderingContext, texture: WebGLTexture, image: HTMLImageElement) {
+    fun textureLoaded(texture: WebGLTexture, image: HTMLImageElement) {
+        var gl = Game.webgl
+
         gl.bindTexture(WebGLRenderingContext.TEXTURE_2D, texture);
         gl.pixelStorei(WebGLRenderingContext.UNPACK_FLIP_Y_WEBGL, 1); // second argument must be an int
         gl.texImage2D(WebGLRenderingContext.TEXTURE_2D, 0, WebGLRenderingContext.RGBA, WebGLRenderingContext.RGBA, WebGLRenderingContext.UNSIGNED_BYTE, image);

diff --git a/KotlinTest.iml b/KotlinTest.iml
index f6bea00..427707b 100644
--- a/KotlinTest.iml
+++ b/KotlinTest.iml
@@ -3,8 +3,8 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/lib/kotludens" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/KotlinTest.ipr b/KotlinTest.ipr
index 5e0b3c1..b8e3748 100644
--- a/KotlinTest.ipr
+++ b/KotlinTest.ipr
@@ -30,13 +30,13 @@
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
       <map>
-        <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" />
+        <entry key="$USER_HOME$/DestinationSol" value="5718836739744" />
+        <entry key="$USER_HOME$/simple/Simple-persistence" value="2890201693583" />
+        <entry key="$USER_HOME$/simple/Simple-web" value="2890212261770" />
+        <entry key="$USER_HOME$/simple/SimpleDatabase" value="2890191706466" />
+        <entry key="$USER_HOME$/simple/Very-simple-templates" value="2890190703434" />
+        <entry key="$USER_HOME$/simple/stats/simple-stats-server" value="2909544379158" />
+        <entry key="$USER_HOME$/work/Kos/KosConvertBranchcode" value="2904315467504" />
       </map>
     </option>
     <option name="externalProjectsViewState">
@@ -74,6 +74,17 @@
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
+  <component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="GenerateJS" type="K2JSConfigurationType" factoryName="Kotlin (JavaScript - experimental)">
+      <K2JSConfigurationSettings>
+        <option name="browserFamily" value="Chrome" />
+        <option name="generatedFilePath" value="$PROJECT_DIR$/web/js/generated" />
+        <option name="pageToOpenFilePath" value="" />
+        <option name="shouldOpenInBrowserAfterTranslation" value="false" />
+      </K2JSConfigurationSettings>
+      <method />
+    </configuration>
+  </component>
   <component name="PropertiesComponent">
     <property name="GoToClass.includeLibraries" value="false" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
diff --git a/lib/kotludens/com/persesgames/game/Game.kt b/lib/kotludens/com/persesgames/game/Game.kt
index ba9cd14..3b083d3 100644
--- a/lib/kotludens/com/persesgames/game/Game.kt
+++ b/lib/kotludens/com/persesgames/game/Game.kt
@@ -1,8 +1,6 @@
 package com.persesgames.game
 
-import com.persesgames.game
 import com.persesgames.texture.Textures
-import com.persesgames.time
 import org.khronos.webgl.WebGLRenderingContext
 import org.w3c.dom.HTMLCanvasElement
 import kotlin.browser.document
@@ -16,27 +14,25 @@
     override fun update(time: Float) {
     }
 
-    override fun render(webgl: WebGLRenderingContext) {
+    override fun render() {
         // show loading  message?
+        Game.webgl.clearColor(1f, 1f, 0f, 1f)
+        Game.webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
     }
 }
 
-open class Game(var currentScreen: Screen) {
-    val webgl: WebGLRenderingContext
+object Game {
+    var started = false
+    val webgl: WebGLRenderingContext by lazy {
+        var canvas = document.createElement("canvas") as HTMLCanvasElement
+        document.body!!.appendChild(canvas)
+        canvas.getContext("webgl") as WebGLRenderingContext
+    }
+    var currentScreen: Screen = DefaultScreen()
     var start = Date().getTime()
     var currentTime = start
     var currentDelta = 0f
 
-    init {
-        var canvas = document.createElement("canvas") as HTMLCanvasElement
-        document.body!!.appendChild(canvas)
-        webgl = canvas.getContext("webgl") as WebGLRenderingContext
-
-        resize()
-
-        currentScreen.loadResources()
-    }
-
     fun resize() {
         var canvas = webgl.canvas
         // Check if the canvas is not the same size.
@@ -51,12 +47,19 @@
         }
     }
 
-    fun start() {
+    fun start(startScreen: Screen) {
+        if (started) {
+            throw IllegalStateException("You can only start a game once!")
+        }
+
+        setScreen(startScreen)
+
         // start game loop
+        started = true
         gameLoop()
     }
 
-    open fun setScreen(screen: Screen) {
+    fun setScreen(screen: Screen) {
         currentScreen.closeResources()
 
         currentScreen = screen
@@ -66,21 +69,17 @@
 
     fun gameLoop() {
         if (!Textures.ready()) {
-            return;
-        }
+            Game.webgl.clearColor(1f, 0f, 0f, 1f)
+            Game.webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
+        } else {
+            resize();
 
-        var time = Date().getTime()
-        currentDelta = (currentTime - time) / 1000f
-        currentTime = time
+            var time = Date().getTime()
+            currentDelta = (currentTime - time) / 1000f
+            currentTime = time
 
-        currentScreen.update(currentDelta);
-        currentScreen.render(webgl);
-
-        var testInstance = game
-        if (testInstance != null) {
-            time = Date().getTime()
-            testInstance.update((time - com.persesgames.start) / 1000.0)
-            testInstance.render()
+            currentScreen.update(currentDelta);
+            currentScreen.render();
         }
 
         window.requestAnimationFrame {
diff --git a/lib/kotludens/com/persesgames/game/Screen.kt b/lib/kotludens/com/persesgames/game/Screen.kt
index 572f797..403d7a7 100644
--- a/lib/kotludens/com/persesgames/game/Screen.kt
+++ b/lib/kotludens/com/persesgames/game/Screen.kt
@@ -17,6 +17,6 @@
 
     abstract fun update(time: Float)
 
-    abstract fun render(webgl: WebGLRenderingContext)
+    abstract fun render()
 
 }
diff --git a/lib/kotludens/com/persesgames/sprite/SpriteBatch.kt b/lib/kotludens/com/persesgames/sprite/SpriteBatch.kt
new file mode 100644
index 0000000..fff7e75
--- /dev/null
+++ b/lib/kotludens/com/persesgames/sprite/SpriteBatch.kt
@@ -0,0 +1,11 @@
+package com.persesgames.sprite
+
+/**
+ * User: rnentjes
+ * Date: 20-4-16
+ * Time: 13:48
+ */
+class SpriteBatch {
+
+
+}
diff --git a/lib/kotludens/com/persesgames/texture/Textures.kt b/lib/kotludens/com/persesgames/texture/Textures.kt
index 79e26a8..6e6f788 100644
--- a/lib/kotludens/com/persesgames/texture/Textures.kt
+++ b/lib/kotludens/com/persesgames/texture/Textures.kt
@@ -1,5 +1,6 @@
 package com.persesgames.texture
 
+import com.persesgames.game.Game
 import org.khronos.webgl.WebGLRenderingContext
 import org.khronos.webgl.WebGLTexture
 import org.w3c.dom.HTMLImageElement
@@ -12,30 +13,42 @@
  * Time: 14:52
  */
 
+class Texture(val glTexture: WebGLTexture) {
+
+}
+
 object Textures {
     var textures = HashMap<String, WebGLTexture>();
     var startedLoading = 0
     var loaded = 0
 
-    fun load(gl: WebGLRenderingContext, name: String, filename: String) {
+    fun loadSpriteSheet(name: String, filename: String) {
+
+    }
+
+    fun load(name: String, filename: String) {
+        var gl = Game.webgl
+
         startedLoading++
 
         var webGlTexture = gl.createTexture()
         if (webGlTexture != null) {
             var image = document.createElement("img") as HTMLImageElement
             image.onload = {
-                textureLoaded(gl, webGlTexture, image)
+                textureLoaded(webGlTexture, image)
                 textures.put(name, webGlTexture)
                 loaded++
+                println("loaded texture $loaded/$startedLoading ${ready()}")
             }
             image.src = filename
         } else {
-            println("Couldn't create webgl texture!")
+            throw IllegalStateException("Couldn't create webgl texture!")
         }
-
     }
 
-    fun textureLoaded(gl: WebGLRenderingContext, texture: WebGLTexture, image: HTMLImageElement) {
+    fun textureLoaded(texture: WebGLTexture, image: HTMLImageElement) {
+        var gl = Game.webgl
+
         gl.bindTexture(WebGLRenderingContext.TEXTURE_2D, texture);
         gl.pixelStorei(WebGLRenderingContext.UNPACK_FLIP_Y_WEBGL, 1); // second argument must be an int
         gl.texImage2D(WebGLRenderingContext.TEXTURE_2D, 0, WebGLRenderingContext.RGBA, WebGLRenderingContext.RGBA, WebGLRenderingContext.UNSIGNED_BYTE, image);
diff --git a/src/com/persesgames/Test.kt b/src/com/persesgames/Test.kt
index c7f340d..c11d710 100644
--- a/src/com/persesgames/Test.kt
+++ b/src/com/persesgames/Test.kt
@@ -79,7 +79,7 @@
           0f, 0f, 1f, 0f, 0f
           ))
 
-        Textures.load(webgl, "SHIP", "images/ship2.png")
+        Textures.load("SHIP", "images/ship2.png")
     }
 
     fun update(time: Double) {
@@ -93,7 +93,7 @@
 
         rotX = time.toFloat() / 5f
         rotY = time.toFloat() / 3f
-        z = -20f + Math.sin(time).toFloat() * 19f
+        z = -2f + Math.sin(time).toFloat() * 1f
         //rotZ = time.toFloat()
     }
 
@@ -154,6 +154,7 @@
 
 }
 
+/*
 var game: Test? = null
 var start: Int = Date().getTime()
 var time: Int = Date().getTime()
@@ -190,3 +191,4 @@
 
     loop()
 }
+*/

diff --git a/KotlinTest.iml b/KotlinTest.iml
index f6bea00..427707b 100644
--- a/KotlinTest.iml
+++ b/KotlinTest.iml
@@ -3,8 +3,8 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/lib/kotludens" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/KotlinTest.ipr b/KotlinTest.ipr
index 5e0b3c1..b8e3748 100644
--- a/KotlinTest.ipr
+++ b/KotlinTest.ipr
@@ -30,13 +30,13 @@
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
       <map>
-        <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" />
+        <entry key="$USER_HOME$/DestinationSol" value="5718836739744" />
+        <entry key="$USER_HOME$/simple/Simple-persistence" value="2890201693583" />
+        <entry key="$USER_HOME$/simple/Simple-web" value="2890212261770" />
+        <entry key="$USER_HOME$/simple/SimpleDatabase" value="2890191706466" />
+        <entry key="$USER_HOME$/simple/Very-simple-templates" value="2890190703434" />
+        <entry key="$USER_HOME$/simple/stats/simple-stats-server" value="2909544379158" />
+        <entry key="$USER_HOME$/work/Kos/KosConvertBranchcode" value="2904315467504" />
       </map>
     </option>
     <option name="externalProjectsViewState">
@@ -74,6 +74,17 @@
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
+  <component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="GenerateJS" type="K2JSConfigurationType" factoryName="Kotlin (JavaScript - experimental)">
+      <K2JSConfigurationSettings>
+        <option name="browserFamily" value="Chrome" />
+        <option name="generatedFilePath" value="$PROJECT_DIR$/web/js/generated" />
+        <option name="pageToOpenFilePath" value="" />
+        <option name="shouldOpenInBrowserAfterTranslation" value="false" />
+      </K2JSConfigurationSettings>
+      <method />
+    </configuration>
+  </component>
   <component name="PropertiesComponent">
     <property name="GoToClass.includeLibraries" value="false" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
diff --git a/lib/kotludens/com/persesgames/game/Game.kt b/lib/kotludens/com/persesgames/game/Game.kt
index ba9cd14..3b083d3 100644
--- a/lib/kotludens/com/persesgames/game/Game.kt
+++ b/lib/kotludens/com/persesgames/game/Game.kt
@@ -1,8 +1,6 @@
 package com.persesgames.game
 
-import com.persesgames.game
 import com.persesgames.texture.Textures
-import com.persesgames.time
 import org.khronos.webgl.WebGLRenderingContext
 import org.w3c.dom.HTMLCanvasElement
 import kotlin.browser.document
@@ -16,27 +14,25 @@
     override fun update(time: Float) {
     }
 
-    override fun render(webgl: WebGLRenderingContext) {
+    override fun render() {
         // show loading  message?
+        Game.webgl.clearColor(1f, 1f, 0f, 1f)
+        Game.webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
     }
 }
 
-open class Game(var currentScreen: Screen) {
-    val webgl: WebGLRenderingContext
+object Game {
+    var started = false
+    val webgl: WebGLRenderingContext by lazy {
+        var canvas = document.createElement("canvas") as HTMLCanvasElement
+        document.body!!.appendChild(canvas)
+        canvas.getContext("webgl") as WebGLRenderingContext
+    }
+    var currentScreen: Screen = DefaultScreen()
     var start = Date().getTime()
     var currentTime = start
     var currentDelta = 0f
 
-    init {
-        var canvas = document.createElement("canvas") as HTMLCanvasElement
-        document.body!!.appendChild(canvas)
-        webgl = canvas.getContext("webgl") as WebGLRenderingContext
-
-        resize()
-
-        currentScreen.loadResources()
-    }
-
     fun resize() {
         var canvas = webgl.canvas
         // Check if the canvas is not the same size.
@@ -51,12 +47,19 @@
         }
     }
 
-    fun start() {
+    fun start(startScreen: Screen) {
+        if (started) {
+            throw IllegalStateException("You can only start a game once!")
+        }
+
+        setScreen(startScreen)
+
         // start game loop
+        started = true
         gameLoop()
     }
 
-    open fun setScreen(screen: Screen) {
+    fun setScreen(screen: Screen) {
         currentScreen.closeResources()
 
         currentScreen = screen
@@ -66,21 +69,17 @@
 
     fun gameLoop() {
         if (!Textures.ready()) {
-            return;
-        }
+            Game.webgl.clearColor(1f, 0f, 0f, 1f)
+            Game.webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
+        } else {
+            resize();
 
-        var time = Date().getTime()
-        currentDelta = (currentTime - time) / 1000f
-        currentTime = time
+            var time = Date().getTime()
+            currentDelta = (currentTime - time) / 1000f
+            currentTime = time
 
-        currentScreen.update(currentDelta);
-        currentScreen.render(webgl);
-
-        var testInstance = game
-        if (testInstance != null) {
-            time = Date().getTime()
-            testInstance.update((time - com.persesgames.start) / 1000.0)
-            testInstance.render()
+            currentScreen.update(currentDelta);
+            currentScreen.render();
         }
 
         window.requestAnimationFrame {
diff --git a/lib/kotludens/com/persesgames/game/Screen.kt b/lib/kotludens/com/persesgames/game/Screen.kt
index 572f797..403d7a7 100644
--- a/lib/kotludens/com/persesgames/game/Screen.kt
+++ b/lib/kotludens/com/persesgames/game/Screen.kt
@@ -17,6 +17,6 @@
 
     abstract fun update(time: Float)
 
-    abstract fun render(webgl: WebGLRenderingContext)
+    abstract fun render()
 
 }
diff --git a/lib/kotludens/com/persesgames/sprite/SpriteBatch.kt b/lib/kotludens/com/persesgames/sprite/SpriteBatch.kt
new file mode 100644
index 0000000..fff7e75
--- /dev/null
+++ b/lib/kotludens/com/persesgames/sprite/SpriteBatch.kt
@@ -0,0 +1,11 @@
+package com.persesgames.sprite
+
+/**
+ * User: rnentjes
+ * Date: 20-4-16
+ * Time: 13:48
+ */
+class SpriteBatch {
+
+
+}
diff --git a/lib/kotludens/com/persesgames/texture/Textures.kt b/lib/kotludens/com/persesgames/texture/Textures.kt
index 79e26a8..6e6f788 100644
--- a/lib/kotludens/com/persesgames/texture/Textures.kt
+++ b/lib/kotludens/com/persesgames/texture/Textures.kt
@@ -1,5 +1,6 @@
 package com.persesgames.texture
 
+import com.persesgames.game.Game
 import org.khronos.webgl.WebGLRenderingContext
 import org.khronos.webgl.WebGLTexture
 import org.w3c.dom.HTMLImageElement
@@ -12,30 +13,42 @@
  * Time: 14:52
  */
 
+class Texture(val glTexture: WebGLTexture) {
+
+}
+
 object Textures {
     var textures = HashMap<String, WebGLTexture>();
     var startedLoading = 0
     var loaded = 0
 
-    fun load(gl: WebGLRenderingContext, name: String, filename: String) {
+    fun loadSpriteSheet(name: String, filename: String) {
+
+    }
+
+    fun load(name: String, filename: String) {
+        var gl = Game.webgl
+
         startedLoading++
 
         var webGlTexture = gl.createTexture()
         if (webGlTexture != null) {
             var image = document.createElement("img") as HTMLImageElement
             image.onload = {
-                textureLoaded(gl, webGlTexture, image)
+                textureLoaded(webGlTexture, image)
                 textures.put(name, webGlTexture)
                 loaded++
+                println("loaded texture $loaded/$startedLoading ${ready()}")
             }
             image.src = filename
         } else {
-            println("Couldn't create webgl texture!")
+            throw IllegalStateException("Couldn't create webgl texture!")
         }
-
     }
 
-    fun textureLoaded(gl: WebGLRenderingContext, texture: WebGLTexture, image: HTMLImageElement) {
+    fun textureLoaded(texture: WebGLTexture, image: HTMLImageElement) {
+        var gl = Game.webgl
+
         gl.bindTexture(WebGLRenderingContext.TEXTURE_2D, texture);
         gl.pixelStorei(WebGLRenderingContext.UNPACK_FLIP_Y_WEBGL, 1); // second argument must be an int
         gl.texImage2D(WebGLRenderingContext.TEXTURE_2D, 0, WebGLRenderingContext.RGBA, WebGLRenderingContext.RGBA, WebGLRenderingContext.UNSIGNED_BYTE, image);
diff --git a/src/com/persesgames/Test.kt b/src/com/persesgames/Test.kt
index c7f340d..c11d710 100644
--- a/src/com/persesgames/Test.kt
+++ b/src/com/persesgames/Test.kt
@@ -79,7 +79,7 @@
           0f, 0f, 1f, 0f, 0f
           ))
 
-        Textures.load(webgl, "SHIP", "images/ship2.png")
+        Textures.load("SHIP", "images/ship2.png")
     }
 
     fun update(time: Double) {
@@ -93,7 +93,7 @@
 
         rotX = time.toFloat() / 5f
         rotY = time.toFloat() / 3f
-        z = -20f + Math.sin(time).toFloat() * 19f
+        z = -2f + Math.sin(time).toFloat() * 1f
         //rotZ = time.toFloat()
     }
 
@@ -154,6 +154,7 @@
 
 }
 
+/*
 var game: Test? = null
 var start: Int = Date().getTime()
 var time: Int = Date().getTime()
@@ -190,3 +191,4 @@
 
     loop()
 }
+*/
diff --git a/src/com/persesgames/shooter/Shooter.kt b/src/com/persesgames/shooter/Shooter.kt
index 6658d2f..abd6b9b 100644
--- a/src/com/persesgames/shooter/Shooter.kt
+++ b/src/com/persesgames/shooter/Shooter.kt
@@ -2,6 +2,8 @@
 
 import com.persesgames.game.Game
 import com.persesgames.game.Screen
+import com.persesgames.sprite.SpriteBatch
+import com.persesgames.texture.Textures
 import org.khronos.webgl.WebGLRenderingContext
 
 /**
@@ -9,11 +11,18 @@
  */
 
 class WelcomeScreen: Screen() {
+    var sprites = SpriteBatch()
+
+    override fun loadResources() {
+        Textures.load("SHIP", "images/ship2.png")
+    }
 
     override fun update(time: Float) {
     }
 
-    override fun render(webgl: WebGLRenderingContext) {
+    override fun render() {
+        Game.webgl.clearColor(0f, 1f, 1f, 1f)
+        Game.webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
     }
 
 }
@@ -23,13 +32,11 @@
     override fun update(time: Float) {
     }
 
-    override fun render(webgl: WebGLRenderingContext) {
+    override fun render() {
     }
 
 }
 
 fun main(args: Array<String>) {
-    var game = Game(WelcomeScreen())
-
-    game.start()
-}
\ No newline at end of file
+    Game.start(WelcomeScreen())
+}