diff --git a/src/net/torvald/terrarum/GsonSerialisable.kt b/src/net/torvald/terrarum/GsonSerialisable.kt
index e1d1a458f..f39a89eb5 100644
--- a/src/net/torvald/terrarum/GsonSerialisable.kt
+++ b/src/net/torvald/terrarum/GsonSerialisable.kt
@@ -7,7 +7,9 @@ import com.google.gson.JsonObject
  */
 interface GsonSerialisable {
 
+    /**
+     * Will modify itself according to the input gson. Not sure it's even necessary so please test.
+     */
     fun read(gson: JsonObject)
-    fun write(targetGson: JsonObject)
 
 }
\ No newline at end of file
diff --git a/src/net/torvald/terrarum/KVHashMap.kt b/src/net/torvald/terrarum/KVHashMap.kt
index d137c68ee..f25e98a72 100644
--- a/src/net/torvald/terrarum/KVHashMap.kt
+++ b/src/net/torvald/terrarum/KVHashMap.kt
@@ -1,6 +1,5 @@
 package net.torvald.terrarum
 
-import com.google.gson.Gson
 import com.google.gson.JsonObject
 import com.google.gson.JsonPrimitive
 
@@ -115,12 +114,4 @@ open class KVHashMap : GsonSerialisable {
         TODO()
     }
 
-    override fun write(targetGson: JsonObject) {
-        hashMap.forEach { t, u ->
-            if (u is JsonPrimitive)
-                targetGson.add(t, u)
-            else
-                targetGson.add(t, Gson().toJsonTree(u))
-        }
-    }
 }
\ No newline at end of file
diff --git a/src/net/torvald/terrarum/serialise/SavegameWriter.kt b/src/net/torvald/terrarum/serialise/SavegameWriter.kt
index 9b61b27bb..b086bd496 100644
--- a/src/net/torvald/terrarum/serialise/SavegameWriter.kt
+++ b/src/net/torvald/terrarum/serialise/SavegameWriter.kt
@@ -138,11 +138,15 @@ object SavegameWriter {
                 .setPrettyPrinting()
 
                 .serializeNulls()
+                .disableHtmlEscaping()
+                .enableComplexMapKeySerialization()
                 .create()
     }
     else {
         GsonBuilder()
                 .serializeNulls()
+                .disableHtmlEscaping()
+                .enableComplexMapKeySerialization()
                 .create()
     }
 
diff --git a/src/net/torvald/terrarum/tests/GsonTest.kt b/src/net/torvald/terrarum/tests/GsonTest.kt
index d8304cc4a..090e5aacf 100644
--- a/src/net/torvald/terrarum/tests/GsonTest.kt
+++ b/src/net/torvald/terrarum/tests/GsonTest.kt
@@ -1,6 +1,5 @@
-import com.badlogic.gdx.graphics.Color
-import com.google.gson.GsonBuilder
-import net.torvald.terrarum.gameactors.Actor
+
+import net.torvald.terrarum.serialise.SavegameWriter
 import org.dyn4j.geometry.Vector2
 
 /**
@@ -10,54 +9,42 @@ import org.dyn4j.geometry.Vector2
  */
 object GsonTest {
 
-    operator fun invoke() {
-        val jsonString = GsonBuilder()
-                .setPrettyPrinting()
-                .serializeNulls()
-                .create()
-                .toJson(GsonTestActor())
-
-
-        println(jsonString)
-    }
-
-}
-
-class GsonTestActor : Actor(Actor.RenderOrder.MIDDLE) {
-    override fun update(delta: Float) {
-        TODO("not implemented")
-    }
-
-    override fun onActorValueChange(key: String, value: Any?) {
-        TODO("not implemented")
-    }
-
-    override fun dispose() {
-        TODO("not implemented")
-    }
-
-    override fun run() {
-        TODO("not implemented")
-    }
+    private val testClass = GsonTestClass()
 
     init {
-        referenceID = 42
+        testClass.foo = 42
+        testClass.bar = 1f/42f
+        testClass.baz = "According to all known laws of aviation, there is no way a bee should be able to fly."
+        testClass.fov = Vector2(1.23432, -0.4)
+    }
+
+
+    operator fun invoke() {
+
+        val gson = SavegameWriter.getJsonBuilder()
+        val jsonString = gson.toJson(testClass)
+
+        println(jsonString)
+
+
+        val deserialised = gson.fromJson(jsonString, GsonTestSuper::class.java)
+        println(deserialised)
+        println(deserialised as GsonTestClass) // ClassCastException
     }
 
-    private val mysecretnote = "note"
 }
 
-class GsonTestClass : GsonTestInterface {
-    var foo = 1.567f
-    val bar = "stingy"
-    val baz = Color(0f, 0.2f, 0.4f, 1f)
-    val fov = Vector2(1.324324, -0.4321)
+open class GsonTestSuper(var foo: Int) {
+    override fun toString() = "GsonTestSuper"
+}
 
-    val bazget: Color
-        get() = Color.CHARTREUSE
-
-    @Transient override var superfoo = 42
-    @Transient val tbar = "i'm invisible"
+class GsonTestClass(
+    foo: Int = 0,
+    var bar: Float = 0f,
+    var baz: String = "",
+    var fov: Vector2 = Vector2(0.0,0.0)
+) : GsonTestSuper(foo) {
+    override fun toString() = "GsonTestClass(foo=$foo, bar=$bar, baz=$baz, fov=$fov)"
 }
 
 interface GsonTestInterface {