diff --git a/Client/src/main/java/org/runite/client/AbstractSprite.java b/Client/src/main/java/org/runite/client/AbstractSprite.java
index 9348f9263..ee031a31a 100644
--- a/Client/src/main/java/org/runite/client/AbstractSprite.java
+++ b/Client/src/main/java/org/runite/client/AbstractSprite.java
@@ -22,7 +22,7 @@ public abstract class AbstractSprite extends Node {
 
    public static RSInterface method638(int var1, int var2) {
       try {
-         RSInterface var3 = Class7.getRSInterface(var1);
+         RSInterface var3 = Unsorted.getRSInterface(var1);
          return var2 == -1 ?var3: var3 != null && var3.aClass11Array262 != null && var2 < var3.aClass11Array262.length ?var3.aClass11Array262[var2]:null;
       } catch (RuntimeException var4) {
          throw ClientErrorException.clientError(var4, "qf.P(" + (byte) -19 + ',' + var1 + ',' + var2 + ')');
diff --git a/Client/src/main/java/org/runite/client/BufferedDataStream.java b/Client/src/main/java/org/runite/client/BufferedDataStream.java
index c8ce5c186..9d12f3754 100644
--- a/Client/src/main/java/org/runite/client/BufferedDataStream.java
+++ b/Client/src/main/java/org/runite/client/BufferedDataStream.java
@@ -77,7 +77,7 @@ public final class BufferedDataStream extends DataBuffer {
                     TextureOperation12.outgoingBuffer.writeShort128LE(Class164.anInt2050);
                     TextureOperation12.outgoingBuffer.writeShort128LE(var5);
                     anInt2330 = 0;
-                    Unsorted.aClass11_1933 = Class7.getRSInterface(var3);
+                    Unsorted.aClass11_1933 = Unsorted.getRSInterface(var3);
                     KeyboardListener.anInt1918 = var2;
                     System.out.println(anInt1473 + ", " + var3 + ", " + var2 + ", " + Class3_Sub28_Sub18.anInt3764 + ", " + Class164.anInt2050 + ", " + var5);
                 }
@@ -128,7 +128,7 @@ public final class BufferedDataStream extends DataBuffer {
                     TextureOperation12.outgoingBuffer.putShortA(var2);
                     TextureOperation12.outgoingBuffer.writeIntV2(var3);
                     anInt2330 = 0;
-                    Unsorted.aClass11_1933 = Class7.getRSInterface(var3);
+                    Unsorted.aClass11_1933 = Unsorted.getRSInterface(var3);
                     KeyboardListener.anInt1918 = var2;
                 }
 
@@ -199,7 +199,7 @@ public final class BufferedDataStream extends DataBuffer {
 
                 RSInterface var13;
                 if (var4 == 1006) {
-                    var13 = Class7.getRSInterface(var3);
+                    var13 = Unsorted.getRSInterface(var3);
                     if (null != var13 && var13.itemIds[var2] >= 100000) {
                         addChatMessage(RSString.parse(""), 0, RSString.stringCombiner(new RSString[]{RSString.stringAnimator(var13.itemIds[var2]), TextCore.aClass94_3777, ItemDefinition.getItemDefinition(var5).name}), -1);
                     } else {
@@ -208,7 +208,7 @@ public final class BufferedDataStream extends DataBuffer {
                     }
 
                     anInt2330 = 0;
-                    Unsorted.aClass11_1933 = Class7.getRSInterface(var3);
+                    Unsorted.aClass11_1933 = Unsorted.getRSInterface(var3);
                     KeyboardListener.anInt1918 = var2;
                 }
 
@@ -261,7 +261,7 @@ public final class BufferedDataStream extends DataBuffer {
                         TextureOperation12.outgoingBuffer.putShortA(var2);
                         TextureOperation12.outgoingBuffer.writeIntV2(var3);
                         anInt2330 = 0;
-                        Unsorted.aClass11_1933 = Class7.getRSInterface(var3);
+                        Unsorted.aClass11_1933 = Unsorted.getRSInterface(var3);
 
 
                     } else {
@@ -270,7 +270,7 @@ public final class BufferedDataStream extends DataBuffer {
                         TextureOperation12.outgoingBuffer.putShortA(var5);
                         TextureOperation12.outgoingBuffer.writeIntLE2(var3);
                         anInt2330 = 0;
-                        Unsorted.aClass11_1933 = Class7.getRSInterface(var3);
+                        Unsorted.aClass11_1933 = Unsorted.getRSInterface(var3);
                     }
                     KeyboardListener.anInt1918 = var2;
                 }
@@ -283,7 +283,7 @@ public final class BufferedDataStream extends DataBuffer {
                     TextureOperation12.outgoingBuffer.putShortA(var5);
                     TextureOperation12.outgoingBuffer.writeShortLE(RSInterface.anInt278);
                     anInt2330 = 0;
-                    Unsorted.aClass11_1933 = Class7.getRSInterface(var3);
+                    Unsorted.aClass11_1933 = Unsorted.getRSInterface(var3);
                     KeyboardListener.anInt1918 = var2;
                 }
 
@@ -320,7 +320,7 @@ public final class BufferedDataStream extends DataBuffer {
                     TextureOperation12.outgoingBuffer.writeShortLE(var2);//data
                     TextureOperation12.outgoingBuffer.writeIntLE2(var3);//slot
                     anInt2330 = 0;
-                    Unsorted.aClass11_1933 = Class7.getRSInterface(var3);
+                    Unsorted.aClass11_1933 = Unsorted.getRSInterface(var3);
                     KeyboardListener.anInt1918 = var2;
                 }
 
@@ -359,7 +359,7 @@ public final class BufferedDataStream extends DataBuffer {
                         TextureOperation12.outgoingBuffer.putShortA(var2);
                         TextureOperation12.outgoingBuffer.writeIntV2(var3);
                         anInt2330 = 0;
-                        Unsorted.aClass11_1933 = Class7.getRSInterface(var3);
+                        Unsorted.aClass11_1933 = Unsorted.getRSInterface(var3);
 
                     } else {
                         TextureOperation12.outgoingBuffer.putOpcode(55);
@@ -367,7 +367,7 @@ public final class BufferedDataStream extends DataBuffer {
                         TextureOperation12.outgoingBuffer.putShortA(var2);
                         TextureOperation12.outgoingBuffer.writeIntV1(var3);
                         anInt2330 = 0;
-                        Unsorted.aClass11_1933 = Class7.getRSInterface(var3);
+                        Unsorted.aClass11_1933 = Unsorted.getRSInterface(var3);
 
                     }
                     KeyboardListener.anInt1918 = var2;
@@ -445,7 +445,7 @@ public final class BufferedDataStream extends DataBuffer {
                         TextureOperation12.outgoingBuffer.writeShort128LE(var5);
                         TextureOperation12.outgoingBuffer.writeShort128LE(var2);
                         anInt2330 = 0;
-                        Unsorted.aClass11_1933 = Class7.getRSInterface(var3);
+                        Unsorted.aClass11_1933 = Unsorted.getRSInterface(var3);
                         KeyboardListener.anInt1918 = var2;
                     }
 
@@ -490,7 +490,7 @@ public final class BufferedDataStream extends DataBuffer {
                         TextureOperation12.outgoingBuffer.writeShort(var5);
                         TextureOperation12.outgoingBuffer.writeIntV1(var3);
                         anInt2330 = 0;
-                        Unsorted.aClass11_1933 = Class7.getRSInterface(var3);
+                        Unsorted.aClass11_1933 = Unsorted.getRSInterface(var3);
                         KeyboardListener.anInt1918 = var2;
                     }
 
@@ -511,7 +511,7 @@ public final class BufferedDataStream extends DataBuffer {
                     if (var4 == 51) {
                         TextureOperation12.outgoingBuffer.putOpcode(10);
                         TextureOperation12.outgoingBuffer.writeInt(var3);
-                        var13 = Class7.getRSInterface(var3);
+                        var13 = Unsorted.getRSInterface(var3);
                         if (Objects.requireNonNull(var13).childDataBuffers != null && var13.childDataBuffers[0][0] == 5) {
                             var12 = var13.childDataBuffers[0][1];
                             if (ItemDefinition.ram[var12] != var13.anIntArray307[0]) {
@@ -541,7 +541,7 @@ public final class BufferedDataStream extends DataBuffer {
                     if (59 == var4) {
                         TextureOperation12.outgoingBuffer.putOpcode(10);
                         TextureOperation12.outgoingBuffer.writeInt(var3);
-                        var13 = Class7.getRSInterface(var3);
+                        var13 = Unsorted.getRSInterface(var3);
                         if (Objects.requireNonNull(var13).childDataBuffers != null && var13.childDataBuffers[0][0] == 5) {
                             var12 = var13.childDataBuffers[0][1];
                             ItemDefinition.ram[var12] = -ItemDefinition.ram[var12] + 1;
@@ -591,7 +591,7 @@ public final class BufferedDataStream extends DataBuffer {
                     }
 
                     if (8 == var4) {
-                        var13 = Class7.getRSInterface(var3);
+                        var13 = Unsorted.getRSInterface(var3);
                         boolean var15 = true;
                         if (0 < Objects.requireNonNull(var13).anInt189) {
                             var15 = method715(var13);
@@ -625,7 +625,7 @@ public final class BufferedDataStream extends DataBuffer {
                         TextureOperation12.outgoingBuffer.writeShort(var2);
                         TextureOperation12.outgoingBuffer.putShortA(var5);
                         anInt2330 = 0;
-                        Unsorted.aClass11_1933 = Class7.getRSInterface(var3);
+                        Unsorted.aClass11_1933 = Unsorted.getRSInterface(var3);
                         KeyboardListener.anInt1918 = var2;
                     }
 
@@ -665,7 +665,7 @@ public final class BufferedDataStream extends DataBuffer {
                         TextureOperation12.outgoingBuffer.putShortA(var2);
                         TextureOperation12.outgoingBuffer.writeShortLE(var5);
                         anInt2330 = 0;
-                        Unsorted.aClass11_1933 = Class7.getRSInterface(var3);
+                        Unsorted.aClass11_1933 = Unsorted.getRSInterface(var3);
                         KeyboardListener.anInt1918 = var2;
                     }
 
@@ -690,13 +690,13 @@ public final class BufferedDataStream extends DataBuffer {
                             TextureOperation12.outgoingBuffer.putShortA(var2);
                             TextureOperation12.outgoingBuffer.writeIntV2(var3);
                             anInt2330 = 0;
-                            Unsorted.aClass11_1933 = Class7.getRSInterface(var3);
+                            Unsorted.aClass11_1933 = Unsorted.getRSInterface(var3);
                             KeyboardListener.anInt1918 = var2;
 
                         } else {
 
                             Class25.method958((byte) -86);
-                            var13 = Class7.getRSInterface(var3);
+                            var13 = Unsorted.getRSInterface(var3);
                             Class3_Sub28_Sub18.anInt3764 = var3;
                             anInt1473 = var2;
                             Class164_Sub1.anInt3012 = 1;
@@ -722,7 +722,7 @@ public final class BufferedDataStream extends DataBuffer {
                             TextureOperation12.outgoingBuffer.writeIntV1(var3);
                             TextureOperation12.outgoingBuffer.writeShort128LE(var5);
                             anInt2330 = 0;
-                            Unsorted.aClass11_1933 = Class7.getRSInterface(var3);
+                            Unsorted.aClass11_1933 = Unsorted.getRSInterface(var3);
                             KeyboardListener.anInt1918 = var2;
                         }
 
@@ -745,7 +745,7 @@ public final class BufferedDataStream extends DataBuffer {
                             TextureOperation12.outgoingBuffer.writeShortLE(var2);
                             TextureOperation12.outgoingBuffer.writeShortLE(var5);
                             anInt2330 = 0;
-                            Unsorted.aClass11_1933 = Class7.getRSInterface(var3);
+                            Unsorted.aClass11_1933 = Unsorted.getRSInterface(var3);
                             KeyboardListener.anInt1918 = var2;
                         }
 
@@ -836,7 +836,7 @@ public final class BufferedDataStream extends DataBuffer {
 
                         if (Class164_Sub1.anInt3012 != 0) {
                             Class164_Sub1.anInt3012 = 0;
-                            Class20.method909(Class7.getRSInterface(Class3_Sub28_Sub18.anInt3764));
+                            Class20.method909(Unsorted.getRSInterface(Class3_Sub28_Sub18.anInt3764));
                         }
 
                         if (GameObject.aBoolean1837) {
@@ -1058,7 +1058,7 @@ public final class BufferedDataStream extends DataBuffer {
 
                     if (!var3) {
                         var5 = (int) var1.linkableKey;
-                        RSInterface var6 = Class7.getRSInterface(var5);
+                        RSInterface var6 = Unsorted.getRSInterface(var5);
                         if (null != var6) {
                             Class20.method909(var6);
                         }
diff --git a/Client/src/main/java/org/runite/client/CS2Methods.java b/Client/src/main/java/org/runite/client/CS2Methods.java
index cc17268b2..29e73697e 100644
--- a/Client/src/main/java/org/runite/client/CS2Methods.java
+++ b/Client/src/main/java/org/runite/client/CS2Methods.java
@@ -1,6 +1,8 @@
 package org.runite.client;
 
 public class CS2Methods {
+    static QuickChat aQuickChat_1056;
+
     static RSString method27(RSString var0) {
         try {
 
@@ -19,4 +21,20 @@ public class CS2Methods {
             throw ClientErrorException.clientError(var2, "rc.Q(" + true + ')');
         }
     }
+
+    static void method852(int var1) {
+        try {
+            Class3_Sub25 var2 = (Class3_Sub25) Class3_Sub2.aHashTable_2220.get(var1);
+            if (var2 != null) {
+
+                for (int var3 = 0; var2.anIntArray2547.length > var3; ++var3) {
+                    var2.anIntArray2547[var3] = -1;
+                    var2.anIntArray2551[var3] = 0;
+                }
+
+            }
+        } catch (RuntimeException var4) {
+            throw ClientErrorException.clientError(var4, "bd.C(" + (byte) 114 + ',' + var1 + ')');
+        }
+    }
 }
diff --git a/Client/src/main/java/org/runite/client/CS2Script.java b/Client/src/main/java/org/runite/client/CS2Script.java
index 2c499718e..c5cd28611 100644
--- a/Client/src/main/java/org/runite/client/CS2Script.java
+++ b/Client/src/main/java/org/runite/client/CS2Script.java
@@ -510,7 +510,7 @@ public final class CS2Script extends Linkable {
                         int k66 = ItemDefinition.intsStack[2 + iStackCounter];
                         if (i44 == 0)
                             throw new RuntimeException();
-                        RSInterface class11_21 = Class7.getRSInterface(j6);
+                        RSInterface class11_21 = Unsorted.getRSInterface(j6);
                         if (null == class11_21.aClass11Array262)
                             class11_21.aClass11Array262 = new RSInterface[k66 + 1];
                         if (k66 >= class11_21.aClass11Array262.length) {
@@ -542,13 +542,13 @@ public final class CS2Script extends Linkable {
                                 throw new RuntimeException("Tried to cc_delete static active-component!");
                             else
                                 throw new RuntimeException("Tried to .cc_delete static .active-component!");
-                        RSInterface class11_17 = Class7.getRSInterface(class11.componentHash);
+                        RSInterface class11_17 = Unsorted.getRSInterface(class11.componentHash);
                         class11_17.aClass11Array262[class11.anInt191] = null;
                         Class20.method909(class11_17);
                         continue;
                     }
                     if (opcode == 102) {
-                        RSInterface class11_1 = Class7.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
+                        RSInterface class11_1 = Unsorted.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
                         class11_1.aClass11Array262 = null;
                         Class20.method909(class11_1);
                         continue;
@@ -572,7 +572,7 @@ public final class CS2Script extends Linkable {
                     if (opcode != 201)
                         break;
                     int l6 = ItemDefinition.intsStack[--iStackCounter];
-                    RSInterface class11_18 = Class7.getRSInterface(l6);
+                    RSInterface class11_18 = Unsorted.getRSInterface(l6);
                     if (null == class11_18) {
                         ItemDefinition.intsStack[iStackCounter++] = 0;
                     } else {
@@ -590,7 +590,7 @@ public final class CS2Script extends Linkable {
                         if (opcode < 2000) {
                             class11_2 = flag ? Class164.aClass11_2055 : aClass11_1749;
                         } else {
-                            class11_2 = Class7.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
+                            class11_2 = Unsorted.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
                             opcode -= 1000;
                         }
                         if (opcode == 1000) {
@@ -673,7 +673,7 @@ public final class CS2Script extends Linkable {
                             if (opcode >= 1300 && opcode < 1400 || opcode >= 2300 && opcode < 2400) {
                                 RSInterface class11_3;
                                 if (2000 <= opcode) {
-                                    class11_3 = Class7.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
+                                    class11_3 = Unsorted.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
                                     opcode -= 1000;
                                 } else {
                                     class11_3 = flag ? Class164.aClass11_2055 : aClass11_1749;
@@ -838,7 +838,7 @@ public final class CS2Script extends Linkable {
                                         continue;
                                     }
                                     if (2600 > opcode) {
-                                        RSInterface class11_7 = Class7.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
+                                        RSInterface class11_7 = Unsorted.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
                                         if (opcode == 2500) {
                                             ItemDefinition.intsStack[iStackCounter++] = class11_7.anInt306;
                                             continue;
@@ -915,7 +915,7 @@ public final class CS2Script extends Linkable {
                                                         int j46 = ItemDefinition.intsStack[iStackCounter - -1];
                                                         int j7 = ItemDefinition.intsStack[iStackCounter];
                                                         int l67 = ItemDefinition.intsStack[2 + iStackCounter];
-                                                        RSInterface class11_22 = Class7.getRSInterface(l67);
+                                                        RSInterface class11_22 = Unsorted.getRSInterface(l67);
                                                         InterfaceWidget.a(j46, j7, 115, class11_22);
                                                         continue;
                                                     }
@@ -1889,14 +1889,14 @@ public final class CS2Script extends Linkable {
                                                                     }
                                                                     if (opcode == 5055) {
                                                                         int k26 = ItemDefinition.intsStack[--iStackCounter];
-                                                                        ItemDefinition.stringsStack[sStackCounter++] = LinkableRSString.method733(k26).method554();
+                                                                        ItemDefinition.stringsStack[sStackCounter++] = QuickChat.method733(k26).method554();
                                                                         continue;
                                                                     }
                                                                     if (opcode == 5056) {
                                                                         int l26 = ItemDefinition.intsStack[--iStackCounter];
-                                                                        Class3_Sub28_Sub4 class3_sub28_sub4 = LinkableRSString.method733(l26);
-                                                                        if (null != class3_sub28_sub4.anIntArray3567)
-                                                                            ItemDefinition.intsStack[iStackCounter++] = class3_sub28_sub4.anIntArray3567.length;
+                                                                        QuickChatDefinition quickChatDefinition = QuickChat.method733(l26);
+                                                                        if (null != quickChatDefinition.anIntArray3567)
+                                                                            ItemDefinition.intsStack[iStackCounter++] = quickChatDefinition.anIntArray3567.length;
                                                                         else
                                                                             ItemDefinition.intsStack[iStackCounter++] = 0;
                                                                         continue;
@@ -1905,14 +1905,14 @@ public final class CS2Script extends Linkable {
                                                                         iStackCounter -= 2;
                                                                         int k56 = ItemDefinition.intsStack[1 + iStackCounter];
                                                                         int i27 = ItemDefinition.intsStack[iStackCounter];
-                                                                        ItemDefinition.intsStack[iStackCounter++] = LinkableRSString.method733(i27).anIntArray3567[k56];
+                                                                        ItemDefinition.intsStack[iStackCounter++] = QuickChat.method733(i27).anIntArray3567[k56];
                                                                         continue;
                                                                     }
                                                                     if (opcode == 5058) {
-                                                                        Class70.aClass10_1056 = new Class10();
-                                                                        Class70.aClass10_1056.anInt149 = ItemDefinition.intsStack[--iStackCounter];
-                                                                        Class70.aClass10_1056.aClass3_Sub28_Sub4_151 = LinkableRSString.method733(Class70.aClass10_1056.anInt149);
-                                                                        Class70.aClass10_1056.anIntArray153 = new int[Class70.aClass10_1056.aClass3_Sub28_Sub4_151.method552()];
+                                                                        CS2Methods.aQuickChat_1056 = new QuickChat();
+                                                                        CS2Methods.aQuickChat_1056.anInt149 = ItemDefinition.intsStack[--iStackCounter];
+                                                                        CS2Methods.aQuickChat_1056.aQuickChatDefinition_151 = QuickChat.method733(CS2Methods.aQuickChat_1056.anInt149);
+                                                                        CS2Methods.aQuickChat_1056.anIntArray153 = new int[CS2Methods.aQuickChat_1056.aQuickChatDefinition_151.method552()];
                                                                         continue;
                                                                     }
                                                                     if (5059 == opcode) {
@@ -1920,8 +1920,8 @@ public final class CS2Script extends Linkable {
                                                                         TextureOperation12.outgoingBuffer.writeByte(0);
                                                                         int j27 = TextureOperation12.outgoingBuffer.index;
                                                                         TextureOperation12.outgoingBuffer.writeByte(0);
-                                                                        TextureOperation12.outgoingBuffer.writeShort(Class70.aClass10_1056.anInt149);
-                                                                        Class70.aClass10_1056.aClass3_Sub28_Sub4_151.method545(TextureOperation12.outgoingBuffer, Class70.aClass10_1056.anIntArray153);
+                                                                        TextureOperation12.outgoingBuffer.writeShort(CS2Methods.aQuickChat_1056.anInt149);
+                                                                        CS2Methods.aQuickChat_1056.aQuickChatDefinition_151.method545(TextureOperation12.outgoingBuffer, CS2Methods.aQuickChat_1056.anIntArray153);
                                                                         TextureOperation12.outgoingBuffer.method769(-j27 + TextureOperation12.outgoingBuffer.index);
                                                                         continue;
                                                                     }
@@ -1931,8 +1931,8 @@ public final class CS2Script extends Linkable {
                                                                         TextureOperation12.outgoingBuffer.writeByte(0);
                                                                         int l56 = TextureOperation12.outgoingBuffer.index;
                                                                         TextureOperation12.outgoingBuffer.writeLong(class94_21.toLong());
-                                                                        TextureOperation12.outgoingBuffer.writeShort(Class70.aClass10_1056.anInt149);
-                                                                        Class70.aClass10_1056.aClass3_Sub28_Sub4_151.method545(TextureOperation12.outgoingBuffer, Class70.aClass10_1056.anIntArray153);
+                                                                        TextureOperation12.outgoingBuffer.writeShort(CS2Methods.aQuickChat_1056.anInt149);
+                                                                        CS2Methods.aQuickChat_1056.aQuickChatDefinition_151.method545(TextureOperation12.outgoingBuffer, CS2Methods.aQuickChat_1056.anIntArray153);
                                                                         TextureOperation12.outgoingBuffer.method769(TextureOperation12.outgoingBuffer.index + -l56);
                                                                         continue;
                                                                     }
@@ -1941,8 +1941,8 @@ public final class CS2Script extends Linkable {
                                                                         TextureOperation12.outgoingBuffer.writeByte(0);
                                                                         int k27 = TextureOperation12.outgoingBuffer.index;
                                                                         TextureOperation12.outgoingBuffer.writeByte(1);
-                                                                        TextureOperation12.outgoingBuffer.writeShort(Class70.aClass10_1056.anInt149);
-                                                                        Class70.aClass10_1056.aClass3_Sub28_Sub4_151.method545(TextureOperation12.outgoingBuffer, Class70.aClass10_1056.anIntArray153);
+                                                                        TextureOperation12.outgoingBuffer.writeShort(CS2Methods.aQuickChat_1056.anInt149);
+                                                                        CS2Methods.aQuickChat_1056.aQuickChatDefinition_151.method545(TextureOperation12.outgoingBuffer, CS2Methods.aQuickChat_1056.anIntArray153);
                                                                         TextureOperation12.outgoingBuffer.method769(-k27 + TextureOperation12.outgoingBuffer.index);
                                                                         continue;
                                                                     }
@@ -1982,14 +1982,14 @@ public final class CS2Script extends Linkable {
                                                                     }
                                                                     if (opcode == 5066) {
                                                                         int l28 = ItemDefinition.intsStack[--iStackCounter];
-                                                                        ItemDefinition.intsStack[iStackCounter++] = LinkableRSString.method733(l28).method552();
+                                                                        ItemDefinition.intsStack[iStackCounter++] = QuickChat.method733(l28).method552();
                                                                         continue;
                                                                     }
                                                                     if (opcode == 5067) {
                                                                         iStackCounter -= 2;
                                                                         int i58 = ItemDefinition.intsStack[iStackCounter + 1];
                                                                         int i29 = ItemDefinition.intsStack[iStackCounter];
-                                                                        int i70 = LinkableRSString.method733(i29).method550(49, i58);
+                                                                        int i70 = QuickChat.method733(i29).method550(49, i58);
                                                                         ItemDefinition.intsStack[iStackCounter++] = i70;
                                                                         continue;
                                                                     }
@@ -1997,14 +1997,14 @@ public final class CS2Script extends Linkable {
                                                                         iStackCounter -= 2;
                                                                         int j29 = ItemDefinition.intsStack[iStackCounter];
                                                                         int j58 = ItemDefinition.intsStack[1 + iStackCounter];
-                                                                        Class70.aClass10_1056.anIntArray153[j29] = j58;
+                                                                        CS2Methods.aQuickChat_1056.anIntArray153[j29] = j58;
                                                                         continue;
                                                                     }
                                                                     if (opcode == 5069) {
                                                                         iStackCounter -= 2;
                                                                         int k29 = ItemDefinition.intsStack[iStackCounter];
                                                                         int k58 = ItemDefinition.intsStack[iStackCounter + 1];
-                                                                        Class70.aClass10_1056.anIntArray153[k29] = k58;
+                                                                        CS2Methods.aQuickChat_1056.anIntArray153[k29] = k58;
                                                                         continue;
                                                                     }
                                                                     if (opcode == 5070) {
@@ -2012,10 +2012,10 @@ public final class CS2Script extends Linkable {
                                                                         int l29 = ItemDefinition.intsStack[iStackCounter];
                                                                         int j70 = ItemDefinition.intsStack[iStackCounter - -2];
                                                                         int l58 = ItemDefinition.intsStack[iStackCounter + 1];
-                                                                        Class3_Sub28_Sub4 class3_sub28_sub4_1 = LinkableRSString.method733(l29);
-                                                                        if (0 != class3_sub28_sub4_1.method550(73, l58))
+                                                                        QuickChatDefinition quickChatDefinition_1 = QuickChat.method733(l29);
+                                                                        if (0 != quickChatDefinition_1.method550(73, l58))
                                                                             throw new RuntimeException("bad command");
-                                                                        ItemDefinition.intsStack[iStackCounter++] = class3_sub28_sub4_1.method549(j70, l58);
+                                                                        ItemDefinition.intsStack[iStackCounter++] = quickChatDefinition_1.method549(j70, l58);
                                                                         continue;
                                                                     }
                                                                     if (opcode == 5071) {
@@ -2606,7 +2606,7 @@ public final class CS2Script extends Linkable {
                                                                         }
                                                                         if (6012 == opcode) {
                                                                             if (HDToolKit.highDetail)
-                                                                                Class3_Sub28_Sub4.method551(0, 0);
+                                                                                Unsorted.method551(0, 0);
                                                                             Class106.aBoolean1441 = ItemDefinition.intsStack[--iStackCounter] == 1;
                                                                             if (HDToolKit.highDetail && Class106.aBoolean1441) {
                                                                                 Class51.method1137(0.7F);
@@ -3429,7 +3429,7 @@ public final class CS2Script extends Linkable {
                                                 ItemDefinition.stringsStack[sStackCounter++] = Class3_Sub23.method407(Class3_Sub20.paramLanguage, flag1, 0, k64);
                                                 continue;
                                             }
-                                            RSInterface class11_8 = Class7.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
+                                            RSInterface class11_8 = Unsorted.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
                                             if (opcode == 2800) {
                                                 ItemDefinition.intsStack[iStackCounter++] = Client.method44(class11_8).method101();
                                                 continue;
@@ -3452,12 +3452,12 @@ public final class CS2Script extends Linkable {
                                             continue;
                                         }
                                         if (opcode == 2700) {
-                                            RSInterface class11_9 = Class7.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
+                                            RSInterface class11_9 = Unsorted.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
                                             ItemDefinition.intsStack[iStackCounter++] = class11_9.anInt192;
                                             continue;
                                         }
                                         if (opcode == 2701) {
-                                            RSInterface class11_10 = Class7.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
+                                            RSInterface class11_10 = Unsorted.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
                                             if (-1 != class11_10.anInt192)
                                                 ItemDefinition.intsStack[iStackCounter++] = class11_10.anInt271;
                                             else
@@ -3474,7 +3474,7 @@ public final class CS2Script extends Linkable {
                                             continue;
                                         }
                                         if (opcode == 2703) {
-                                            RSInterface class11_11 = Class7.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
+                                            RSInterface class11_11 = Unsorted.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
                                             if (null == class11_11.aClass11Array262) {
                                                 ItemDefinition.intsStack[iStackCounter++] = 0;
                                             } else {
@@ -3505,7 +3505,7 @@ public final class CS2Script extends Linkable {
                                             ItemDefinition.intsStack[iStackCounter++] = 1;
                                         continue;
                                     }
-                                    RSInterface class11_12 = Class7.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
+                                    RSInterface class11_12 = Unsorted.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
                                     if (2600 == opcode) {
                                         ItemDefinition.intsStack[iStackCounter++] = class11_12.anInt247;
                                         continue;
@@ -3580,7 +3580,7 @@ public final class CS2Script extends Linkable {
                                     class11_14 = flag ? Class164.aClass11_2055 : aClass11_1749;
                                 } else {
                                     opcode -= 1000;
-                                    class11_14 = Class7.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
+                                    class11_14 = Unsorted.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
                                 }
                                 int[] ai3 = null;
                                 RSString class94_62 = ItemDefinition.stringsStack[--sStackCounter];
@@ -3677,7 +3677,7 @@ public final class CS2Script extends Linkable {
                         if (opcode < 2000) {
                             class11_15 = flag ? Class164.aClass11_2055 : aClass11_1749;
                         } else {
-                            class11_15 = Class7.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
+                            class11_15 = Unsorted.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
                             opcode -= 1000;
                         }
                         Class20.method909(class11_15);
@@ -3746,7 +3746,7 @@ public final class CS2Script extends Linkable {
                         class11_16 = flag ? Class164.aClass11_2055 : aClass11_1749;
                     } else {
                         opcode -= 1000;
-                        class11_16 = Class7.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
+                        class11_16 = Unsorted.getRSInterface(ItemDefinition.intsStack[--iStackCounter]);
                     }
                     if (opcode == 1100) {
                         iStackCounter -= 2;
diff --git a/Client/src/main/java/org/runite/client/Class10.java b/Client/src/main/java/org/runite/client/Class10.java
deleted file mode 100644
index ea8760e80..000000000
--- a/Client/src/main/java/org/runite/client/Class10.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.runite.client;
-
-final class Class10 {
-
-    static CacheIndex aClass153_152;
-    static int anInt154 = 0;
-    int anInt149;
-    Class3_Sub28_Sub4 aClass3_Sub28_Sub4_151;
-    int[] anIntArray153;
-
-    static Class3_Sub28_Sub16_Sub2[] method851() {
-        try {
-            Class3_Sub28_Sub16_Sub2[] var1 = new Class3_Sub28_Sub16_Sub2[Class95.anInt1338];
-
-            for (int var2 = 0; Class95.anInt1338 > var2; ++var2) {
-                int var3 = Unsorted.anIntArray3076[var2] * Class140_Sub7.anIntArray2931[var2];
-                byte[] var4 = Class163_Sub1.aByteArrayArray2987[var2];
-                int[] var5 = new int[var3];
-
-                for (int var6 = 0; var3 > var6; ++var6) {
-                    var5[var6] = TextureOperation38.spritePalette[Unsorted.bitwiseAnd(255, var4[var6])];
-                }
-
-                var1[var2] = new Class3_Sub28_Sub16_Sub2(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[var2], Unsorted.anIntArray2591[var2], Class140_Sub7.anIntArray2931[var2], Unsorted.anIntArray3076[var2], var5);
-            }
-
-            Class39.method1035((byte) 113);
-            return var1;
-        } catch (RuntimeException var7) {
-            throw ClientErrorException.clientError(var7, "bd.B(" + true + ')');
-        }
-    }
-
-    static void method852(byte var0, int var1) {
-        try {
-            Class3_Sub25 var2 = (Class3_Sub25) Class3_Sub2.aHashTable_2220.get(var1);
-            if (var2 != null) {
-                if (var0 != 114) {
-                    aClass153_152 = null;
-                }
-
-                for (int var3 = 0; var2.anIntArray2547.length > var3; ++var3) {
-                    var2.anIntArray2547[var3] = -1;
-                    var2.anIntArray2551[var3] = 0;
-                }
-
-            }
-        } catch (RuntimeException var4) {
-            throw ClientErrorException.clientError(var4, "bd.C(" + var0 + ',' + var1 + ')');
-        }
-    }
-
-}
diff --git a/Client/src/main/java/org/runite/client/Class102.java b/Client/src/main/java/org/runite/client/Class102.java
index ce38cc1b8..4b4ce74b4 100644
--- a/Client/src/main/java/org/runite/client/Class102.java
+++ b/Client/src/main/java/org/runite/client/Class102.java
@@ -368,7 +368,7 @@ public final class Class102 implements Interface2 {
 
     public final void method8(int var1, boolean var2) {
         try {
-            Class3_Sub28_Sub4.method551(255 & this.aByteArray2143[var1], this.aByteArray2144[var1] & 0xFF);
+            Unsorted.method551(255 & this.aByteArray2143[var1], this.aByteArray2144[var1] & 0xFF);
             if (var2) {
                 boolean var3 = false;
                 Class3_Sub28_Sub20 var4 = this.method1613(var1);
diff --git a/Client/src/main/java/org/runite/client/Class110.java b/Client/src/main/java/org/runite/client/Class110.java
index 001f75b20..435c92f4b 100644
--- a/Client/src/main/java/org/runite/client/Class110.java
+++ b/Client/src/main/java/org/runite/client/Class110.java
@@ -125,7 +125,7 @@ final class Class110 {
                         }
 
                         if (object != null) {
-                            boolean var37 = Class7.method835(var2, var7, var9, var19, var12, var13, (GameObject) object, var24);
+                            boolean var37 = method835(var2, var7, var9, var19, var12, var13, (GameObject) object, var24);
                             if (def.aBoolean1525 && var37 && var1) {
                                 int var29 = 15;
                                 if (object instanceof Model) {
@@ -161,7 +161,7 @@ final class Class110 {
                             object = new Class140_Sub3(objectId, type, var10, var0, var7, var9, def.animationId, def.aBoolean1492, null);
                         }
 
-                        Class7.method835(var2, var7, var9, var19, 1, 1, (GameObject) object, var24);
+                        method835(var2, var7, var9, var19, 1, 1, (GameObject) object, var24);
                         if (var1 && type <= 17 && type != 13 && var2 > 0) {
                             Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9] = TextureOperation3.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9], 4);
                         }
@@ -350,7 +350,7 @@ final class Class110 {
                                 object = new Class140_Sub3(objectId, type, var10, var0, var7, var9, def.animationId, def.aBoolean1492, null);
                             }
 
-                            Class7.method835(var2, var7, var9, var19, 1, 1, (GameObject) object, var24);
+                            method835(var2, var7, var9, var19, 1, 1, (GameObject) object, var24);
                             if (def.ClipType != 0 && var4 != null) {
                                 var4.method1489(var7, def.ProjectileClipped, (byte) 127, var9, var12, var13);
                             }
@@ -484,4 +484,13 @@ final class Class110 {
         }
     }
 
+    static boolean method835(int var0, int var1, int var2, int var3, int var4, int var5, GameObject var6, long var8) {
+        if (var6 == null) {
+            return true;
+        } else {
+            int var10 = var1 * 128 + 64 * var4;
+            int var11 = var2 * 128 + 64 * var5;
+            return Class56.method1189(var0, var1, var2, var4, var5, var10, var11, var3, var6, 0, false, var8);
+        }
+    }
 }
diff --git a/Client/src/main/java/org/runite/client/Class140_Sub1_Sub1.java b/Client/src/main/java/org/runite/client/Class140_Sub1_Sub1.java
index a999a4ffd..b5d17ef22 100644
--- a/Client/src/main/java/org/runite/client/Class140_Sub1_Sub1.java
+++ b/Client/src/main/java/org/runite/client/Class140_Sub1_Sub1.java
@@ -2979,7 +2979,7 @@ final class Class140_Sub1_Sub1 extends Model {
             short var7 = this.aShortArray3827[var5];
             if(var7 == -1) {
                HDToolKit.bindTexture2D(-1);
-               Class3_Sub28_Sub4.method551(0, 0);
+               Unsorted.method551(0, 0);
             } else {
                Class51.anInterface2_838.method8(var7 & 65535, true);
             }
diff --git a/Client/src/main/java/org/runite/client/Class141.java b/Client/src/main/java/org/runite/client/Class141.java
index e66a88a33..a3b2a0f1b 100644
--- a/Client/src/main/java/org/runite/client/Class141.java
+++ b/Client/src/main/java/org/runite/client/Class141.java
@@ -126,7 +126,7 @@ final class Class141 {
         HDToolKit.method1847(1);
         HDToolKit.method1823();
         HDToolKit.method1837(false);
-        Class3_Sub28_Sub4.method551(0, 0);
+        Unsorted.method551(0, 0);
         var6.glDepthMask(false);
 
         for (int var7 = 0; var7 < anInt1844; ++var7) {
diff --git a/Client/src/main/java/org/runite/client/Class145.java b/Client/src/main/java/org/runite/client/Class145.java
index a35e661bf..42430a27c 100644
--- a/Client/src/main/java/org/runite/client/Class145.java
+++ b/Client/src/main/java/org/runite/client/Class145.java
@@ -73,7 +73,7 @@ final class Class145 {
                         }
 
                         var12 = Class58.anIntArrayArrayArray914[0][var3][var4] + Class58.anIntArrayArrayArray914[0][var3 + 1][var4] + Class58.anIntArrayArrayArray914[0][var3][var4 + 1] + Class58.anIntArrayArrayArray914[0][var3 + 1][var4 + 1] >> 2;
-                        Class3_Sub28_Sub4.method551(-var12, 3);
+                        Unsorted.method551(-var12, 3);
                         var8 = 201.5F;
                     } else {
                         var8 = 201.5F - 50.0F * (float) (var6 + 1);
diff --git a/Client/src/main/java/org/runite/client/Class146.java b/Client/src/main/java/org/runite/client/Class146.java
index d63b81a07..f26229d87 100644
--- a/Client/src/main/java/org/runite/client/Class146.java
+++ b/Client/src/main/java/org/runite/client/Class146.java
@@ -104,7 +104,7 @@ abstract class Class146 {
             var24.glTranslatef((float) (-var0), (float) (-var1), (float) (-var2));
             if (var22) {
                 Class3_Sub22.method403();
-                Class3_Sub28_Sub4.method551(-1, 3);
+                Unsorted.method551(-1, 3);
                 TextureOperation23.aBoolean3207 = true;
                 WaterShader.method2254();
                 Unsorted.anInt1244 = -1;
diff --git a/Client/src/main/java/org/runite/client/Class155.java b/Client/src/main/java/org/runite/client/Class155.java
index 4ead4d314..e0062618d 100644
--- a/Client/src/main/java/org/runite/client/Class155.java
+++ b/Client/src/main/java/org/runite/client/Class155.java
@@ -23,18 +23,6 @@ class Class155 {
     private int anInt1987 = 0;
     private int anInt1988 = 0;
 
-    static Class10 method2156(DataBuffer var1) {
-        try {
-            Class10 var2 = new Class10();
-            var2.anInt149 = var1.readUnsignedShort();
-
-            var2.aClass3_Sub28_Sub4_151 = LinkableRSString.method733(var2.anInt149);
-            return var2;
-        } catch (RuntimeException var3) {
-            throw ClientErrorException.clientError(var3, "vh.M(" + 1024 + ',' + (var1 != null ? "{...}" : "null") + ')');
-        }
-    }
-
     static void method2162(GameObject var0, int var1, int var2, int var3) {
         Class3_Sub2 var4;
         if (var2 < Unsorted.anInt1234) {
diff --git a/Client/src/main/java/org/runite/client/Class157.java b/Client/src/main/java/org/runite/client/Class157.java
index d3114c04a..ffde11663 100644
--- a/Client/src/main/java/org/runite/client/Class157.java
+++ b/Client/src/main/java/org/runite/client/Class157.java
@@ -61,7 +61,7 @@ final class Class157 {
         try {
             //System.out.println("Class 157 " + var2);
             if (Class75_Sub4.method1351(var1, 0, var0)) {
-                return Class10.method851();
+                return method851();
             } else {
                 return null;
             }
@@ -70,6 +70,29 @@ final class Class157 {
         }
     }
 
+    static Class3_Sub28_Sub16_Sub2[] method851() {
+        try {
+            Class3_Sub28_Sub16_Sub2[] var1 = new Class3_Sub28_Sub16_Sub2[Class95.anInt1338];
+
+            for (int var2 = 0; Class95.anInt1338 > var2; ++var2) {
+                int var3 = Unsorted.anIntArray3076[var2] * Class140_Sub7.anIntArray2931[var2];
+                byte[] var4 = Class163_Sub1.aByteArrayArray2987[var2];
+                int[] var5 = new int[var3];
+
+                for (int var6 = 0; var3 > var6; ++var6) {
+                    var5[var6] = TextureOperation38.spritePalette[Unsorted.bitwiseAnd(255, var4[var6])];
+                }
+
+                var1[var2] = new Class3_Sub28_Sub16_Sub2(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[var2], Unsorted.anIntArray2591[var2], Class140_Sub7.anIntArray2931[var2], Unsorted.anIntArray3076[var2], var5);
+            }
+
+            Class39.method1035((byte) 113);
+            return var1;
+        } catch (RuntimeException var7) {
+            throw ClientErrorException.clientError(var7, "bd.B(" + true + ')');
+        }
+    }
+
     final byte[] method2173(byte[] var1) {
         try {
             if (null != this.anIntArrayArray1999) {
diff --git a/Client/src/main/java/org/runite/client/Class163_Sub1.java b/Client/src/main/java/org/runite/client/Class163_Sub1.java
index 599711180..cc08549a8 100644
--- a/Client/src/main/java/org/runite/client/Class163_Sub1.java
+++ b/Client/src/main/java/org/runite/client/Class163_Sub1.java
@@ -91,7 +91,7 @@ public class Class163_Sub1 extends Class163 {
                      if(var2 == 25 || var2 == 23 || 48 == var2 || var2 == 7 || 13 == var2 || var2 == 47 || var2 == 5 || var2 == 43 || var2 == 35 || var2 == 58 || var2 == 22 || var2 == 1006) {
                         var3 = Class117.anIntArray1613[-1 + Unsorted.menuOptionCount];
                         var4 = Class27.anIntArray512[Unsorted.menuOptionCount + -1];
-                        RSInterface var5 = Class7.getRSInterface(var4);
+                        RSInterface var5 = Unsorted.getRSInterface(var4);
                         Class3_Sub1 var6 = Client.method44(Objects.requireNonNull(var5));
                         if(var6.method100() || var6.method93()) {
                            Class40.anInt677 = 0;
@@ -100,7 +100,7 @@ public class Class163_Sub1 extends Class163 {
                               Class20.method909(Class67.aClass11_1017);
                            }
 
-                           Class67.aClass11_1017 = Class7.getRSInterface(var4);
+                           Class67.aClass11_1017 = Unsorted.getRSInterface(var4);
                            Class129_Sub1.anInt2693 = anInt2993;
                            Unsorted.anInt40 = Class38_Sub1.anInt2614;
                            PacketParser.anInt86 = var3;
diff --git a/Client/src/main/java/org/runite/client/Class164_Sub2.java b/Client/src/main/java/org/runite/client/Class164_Sub2.java
index facddc989..0aab7c30d 100644
--- a/Client/src/main/java/org/runite/client/Class164_Sub2.java
+++ b/Client/src/main/java/org/runite/client/Class164_Sub2.java
@@ -117,7 +117,7 @@ public class Class164_Sub2 extends Class164 {
                   if(var8 == 4) {
                      var11 = var4[var6++] << 16;
                      var11 += var4[var6++];
-                     var12 = Class7.getRSInterface(var11);
+                     var12 = Unsorted.getRSInterface(var11);
                      var13 = var4[var6++];
                      if(-1 != var13 && (!ItemDefinition.getItemDefinition(var13).membersItem || Unsorted.isMember)) {
                         for(var14 = 0; var14 < Objects.requireNonNull(var12).itemAmounts.length; ++var14) {
@@ -156,7 +156,7 @@ public class Class164_Sub2 extends Class164 {
                   if(var8 == 10) {
                      var11 = var4[var6++] << 16;
                      var11 += var4[var6++];
-                     var12 = Class7.getRSInterface(var11);
+                     var12 = Unsorted.getRSInterface(var11);
                      var13 = var4[var6++];
                      if(var13 != -1 && (!ItemDefinition.getItemDefinition(var13).membersItem || Unsorted.isMember)) {
                         for(var14 = 0; var14 < Objects.requireNonNull(var12).itemAmounts.length; ++var14) {
diff --git a/Client/src/main/java/org/runite/client/Class168.java b/Client/src/main/java/org/runite/client/Class168.java
index 40044e244..015c98304 100644
--- a/Client/src/main/java/org/runite/client/Class168.java
+++ b/Client/src/main/java/org/runite/client/Class168.java
@@ -694,7 +694,7 @@ final class Class168 {
 
     static RSInterface method2273(RSInterface iface) {
         if (iface.parentId != -1) {
-            return Class7.getRSInterface(iface.parentId);
+            return Unsorted.getRSInterface(iface.parentId);
         }
 
         int var3 = iface.componentHash >>> 16;
@@ -702,7 +702,7 @@ final class Class168 {
 
         for (Class3_Sub31 var2 = var4.method1393(); null != var2; var2 = var4.method1392()) {
             if (var2.anInt2602 == var3) {
-                return Class7.getRSInterface((int) var2.linkableKey);
+                return Unsorted.getRSInterface((int) var2.linkableKey);
             }
         }
 
@@ -944,7 +944,7 @@ final class Class168 {
     private void method2279(int var2, DataBuffer var3, int var4) {
         try {
             if (var2 == 1) {
-                this.anInt2103 = RSInterface.method869(116, var3.readMedium());
+                this.anInt2103 = RSInterface.method869(var3.readMedium());
             } else if (var2 == 2) {
                 this.anInt2095 = var3.readUnsignedByte();
             } else if (3 == var2) {
@@ -955,7 +955,7 @@ final class Class168 {
             } else if (5 == var2) {
                 this.aBoolean2102 = false;
             } else if (var2 == 7) {
-                this.anInt2098 = RSInterface.method869(116, var3.readMedium());
+                this.anInt2098 = RSInterface.method869(var3.readMedium());
             } else if (var2 == 8) {
                 TextureOperation26.anInt3081 = var4;
             } else if (var2 == 9) {
diff --git a/Client/src/main/java/org/runite/client/Class21.java b/Client/src/main/java/org/runite/client/Class21.java
index 4159da596..3ff07b655 100644
--- a/Client/src/main/java/org/runite/client/Class21.java
+++ b/Client/src/main/java/org/runite/client/Class21.java
@@ -76,7 +76,7 @@ public final class Class21 {
             var4.anInt2602 = interfaceId;
             TextureOperation23.aHashTable_3208.put(interfaceHash, var4);
             TextureOperation20.method232(interfaceId);
-            RSInterface var5 = Class7.getRSInterface(interfaceHash);
+            RSInterface var5 = Unsorted.getRSInterface(interfaceHash);
             if (var5 == null) {
                 System.out.println("Invalid interface opened - [window=" + (interfaceHash >> 16) + ", child=" + (interfaceHash & 0xFF) + ", id=" + interfaceId + "]");
             } else {
diff --git a/Client/src/main/java/org/runite/client/Class24.java b/Client/src/main/java/org/runite/client/Class24.java
index 94b935c45..d0a90d1fa 100644
--- a/Client/src/main/java/org/runite/client/Class24.java
+++ b/Client/src/main/java/org/runite/client/Class24.java
@@ -9,6 +9,7 @@ public final class Class24 {
     static Random aRandom3088 = new Random();
     static int anInt467 = 0;
     static int anInt472 = 0;
+    static CacheIndex aClass153_152;
     private final int[] anIntArray475 = new int[]{-1, -1, -1, -1, -1};
     int anInt466 = -1;
     boolean aBoolean476 = false;
@@ -163,7 +164,7 @@ public final class Class24 {
 
             for (int var4 = 0; var4 < 5; ++var4) {
                 if (this.anIntArray475[var4] != -1) {
-                    var2[var3++] = Model_Sub1.method2015(Class10.aClass153_152, this.anIntArray475[var4]);
+                    var2[var3++] = Model_Sub1.method2015(aClass153_152, this.anIntArray475[var4]);
                 }
             }
 
@@ -195,7 +196,7 @@ public final class Class24 {
                 boolean var2 = true;
 
                 for (int var3 = 0; this.anIntArray474.length > var3; ++var3) {
-                    if (!Class10.aClass153_152.method2129((byte) -90, 0, this.anIntArray474[var3])) {
+                    if (!aClass153_152.method2129((byte) -90, 0, this.anIntArray474[var3])) {
                         var2 = false;
                     }
                 }
@@ -260,7 +261,7 @@ public final class Class24 {
                 Model_Sub1[] var2 = new Model_Sub1[this.anIntArray474.length];
 
                 for (int var3 = 0; this.anIntArray474.length > var3; ++var3) {
-                    var2[var3] = Model_Sub1.method2015(Class10.aClass153_152, this.anIntArray474[var3]);
+                    var2[var3] = Model_Sub1.method2015(aClass153_152, this.anIntArray474[var3]);
                 }
                 Model_Sub1 var7;
                 if (var2.length == 1) {
@@ -294,7 +295,7 @@ public final class Class24 {
             boolean var2 = true;
 
             for (int var3 = 0; var3 < 5; ++var3) {
-                if (-1 != this.anIntArray475[var3] && !Class10.aClass153_152.method2129((byte) 95, 0, this.anIntArray475[var3])) {
+                if (-1 != this.anIntArray475[var3] && !aClass153_152.method2129((byte) 95, 0, this.anIntArray475[var3])) {
                     var2 = false;
                 }
             }
diff --git a/Client/src/main/java/org/runite/client/Class3_Sub11.java b/Client/src/main/java/org/runite/client/Class3_Sub11.java
index dcb8d6746..c981bfa41 100644
--- a/Client/src/main/java/org/runite/client/Class3_Sub11.java
+++ b/Client/src/main/java/org/runite/client/Class3_Sub11.java
@@ -238,7 +238,7 @@ final class Class3_Sub11 extends Linkable {
          GL var10 = HDToolKit.gl;
          if(this.anInt2351 == -1 || var3) {
             HDToolKit.bindTexture2D(-1);
-            Class3_Sub28_Sub4.method551(0, 0);
+            Unsorted.method551(0, 0);
          } else {
             Class51.anInterface2_838.method8(this.anInt2351, true);
          }
diff --git a/Client/src/main/java/org/runite/client/Class3_Sub22.java b/Client/src/main/java/org/runite/client/Class3_Sub22.java
index 1a5341f13..14ed2d2ca 100644
--- a/Client/src/main/java/org/runite/client/Class3_Sub22.java
+++ b/Client/src/main/java/org/runite/client/Class3_Sub22.java
@@ -126,7 +126,7 @@ final class Class3_Sub22 extends Linkable {
          Class146.method2083(var0, var1, var2, null, 0, (byte)0, var13, var14);
          if(HDToolKit.highDetail) {
             TextureOperation23.aBoolean3207 = false;
-            Class3_Sub28_Sub4.method551(0, 0);
+            Unsorted.method551(0, 0);
             Class92.method1512(null);
             Class68.method1265();
          }
diff --git a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub3.java b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub3.java
index 214c04b87..2db33ad29 100644
--- a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub3.java
+++ b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub3.java
@@ -5,7 +5,6 @@ import java.util.Objects;
 final class Class3_Sub24_Sub3 extends Class3_Sub24 {
 
    LinkedList aLinkedList_3489 = new LinkedList();
-   static CacheIndex aClass153_3490;
    static int[] anIntArray3491 = new int[]{0, -1, 0, 1};
    static int maxClientMemory = 64;
    private final Class3_Sub24_Sub4 aClass3_Sub24_Sub4_3493;
diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub3.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub3.java
index 44f29a557..1c5031f0c 100644
--- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub3.java
+++ b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub3.java
@@ -88,10 +88,10 @@ final class Class3_Sub28_Sub3 extends Node {
          int var4 = 0;
          short[] var3 = new short[16];
          int var6 = !var1?0:32768;
-         int var7 = (!var1?Class83.anInt1156:RenderAnimationDefinition.anInt377) + var6;
+         int var7 = (!var1? QuickChat.anInt1156: QuickChat.anInt377) + var6;
 
          for(int var8 = var6; var8 < var7; ++var8) {
-            Class3_Sub28_Sub4 var9 = LinkableRSString.method733(var8);
+            QuickChatDefinition var9 = QuickChat.method733(var8);
             if(var9.aBoolean3568 && var9.method554().toLowercase().indexOf(var2, 112) != -1) {
                if(var4 >= 50) {
                   Unsorted.anInt952 = -1;
@@ -117,7 +117,7 @@ final class Class3_Sub28_Sub3 extends Node {
          RSString[] var13 = new RSString[Unsorted.anInt952];
 
          for(int var14 = 0; Unsorted.anInt952 > var14; ++var14) {
-            var13[var14] = LinkableRSString.method733(var3[var14]).method554();
+            var13[var14] = QuickChat.method733(var3[var14]).method554();
          }
 
          TextureOperation3.method307(var13, Class99.aShortArray1398, 100);
diff --git a/Client/src/main/java/org/runite/client/Class44.java b/Client/src/main/java/org/runite/client/Class44.java
index 9b2db9886..48e053a3a 100644
--- a/Client/src/main/java/org/runite/client/Class44.java
+++ b/Client/src/main/java/org/runite/client/Class44.java
@@ -82,7 +82,7 @@ public abstract class Class44 {
 
     static void method1073() {
         try {
-            Class3_Sub28_Sub4.method551(0, 0);
+            Unsorted.method551(0, 0);
 
         } catch (RuntimeException var2) {
             throw ClientErrorException.clientError(var2, "gj.L(" + 97 + ')');
diff --git a/Client/src/main/java/org/runite/client/Class49.java b/Client/src/main/java/org/runite/client/Class49.java
index 289b58425..84abfab71 100644
--- a/Client/src/main/java/org/runite/client/Class49.java
+++ b/Client/src/main/java/org/runite/client/Class49.java
@@ -124,7 +124,7 @@ public final class Class49 {
                 }
             }
 
-            return Class3_Sub28_Sub4.method612(var1);
+            return QuickChatDefinition.method612(var1);
         } catch (RuntimeException var6) {
             throw ClientErrorException.clientError(var6, "ha.H(" + (var0 != null ? "{...}" : "null") + ',' + var1 + ',' + var3 + ',' + false + ')');
         }
@@ -149,7 +149,7 @@ public final class Class49 {
                 var3 = var3 + var0;
             }
 
-            Class7.method831(var3);
+            method831(var3);
             var3 = InterfaceWidget.a(":", "%3a", var3);
             var3 = InterfaceWidget.a("@", "%40", var3);
             var3 = InterfaceWidget.a("&", "%26", var3);
@@ -344,4 +344,7 @@ public final class Class49 {
         }
     }
 
+    static void method831(String var1) {
+        System.out.println("Error: " + InterfaceWidget.a("%0a", "\n", var1));
+    }
 }
diff --git a/Client/src/main/java/org/runite/client/Class65.java b/Client/src/main/java/org/runite/client/Class65.java
index 8cf5fb1b5..ee7873d75 100644
--- a/Client/src/main/java/org/runite/client/Class65.java
+++ b/Client/src/main/java/org/runite/client/Class65.java
@@ -61,15 +61,6 @@ public final class Class65 {
         }
     }
 
-    static void method1236(CacheIndex var0, CacheIndex var1) {
-        try {
-            Unsorted.quickChatMessages = var1;
-            Unsorted.aClass153_332 = var0;
-        } catch (RuntimeException var4) {
-            throw ClientErrorException.clientError(var4, "ja.F(" + (var0 != null ? "{...}" : "null") + ',' + (var1 != null ? "{...}" : "null") + ',' + -117 + ')');
-        }
-    }
-
     static void method1237(int var0) {
         try {
             WorldListEntry.anInt2626 = 1000 / var0;
diff --git a/Client/src/main/java/org/runite/client/Class68.java b/Client/src/main/java/org/runite/client/Class68.java
index baedbb422..d9d44b767 100644
--- a/Client/src/main/java/org/runite/client/Class68.java
+++ b/Client/src/main/java/org/runite/client/Class68.java
@@ -374,7 +374,7 @@ final class Class68 {
     static void method1277(Class3_Sub2[][][] var2) {
         if (Class106.aBoolean1441) {
             GL var3 = HDToolKit.gl;
-            Class3_Sub28_Sub4.method551(0, 0);
+            Unsorted.method551(0, 0);
             HDToolKit.method1856(0);
             HDToolKit.method1823();
             HDToolKit.bindTexture2D(HDToolKit.anInt1810);
diff --git a/Client/src/main/java/org/runite/client/Class7.java b/Client/src/main/java/org/runite/client/Class7.java
index e03e96fc7..90d2b2496 100644
--- a/Client/src/main/java/org/runite/client/Class7.java
+++ b/Client/src/main/java/org/runite/client/Class7.java
@@ -12,54 +12,6 @@ public final class Class7 implements Interface4 {
     static short[] aShortArray2167 = new short[]{(short) 30, (short) 6, (short) 31, (short) 29, (short) 10, (short) 44, (short) 37, (short) 57};
 
 
-    static void method831(String var1) {
-        System.out.println("Error: " + InterfaceWidget.a("%0a", "\n", var1));
-    }
-
-    public static RSInterface getRSInterface(int interfaceHash) {
-        try {
-            int windowId = interfaceHash >> 16;
-
-            int componentId = 65535 & interfaceHash;
-            if (GameObject.aClass11ArrayArray1834.length <= windowId || windowId < 0) {
-                return null;
-            }
-            if (GameObject.aClass11ArrayArray1834[windowId] == null || GameObject.aClass11ArrayArray1834[windowId].length <= componentId || null == GameObject.aClass11ArrayArray1834[windowId][componentId]) {
-                boolean var4 = Unsorted.loadInterface(windowId);
-                if (!var4) {
-                    return null;
-                }
-            }
-            if (GameObject.aClass11ArrayArray1834[windowId].length <= componentId) {
-                return null;
-            }
-            return GameObject.aClass11ArrayArray1834[windowId][componentId];
-        } catch (RuntimeException var5) {
-            throw ClientErrorException.clientError(var5, "af.F(" + interfaceHash + ')');
-        }
-    }
-
-    static void method834() {
-        try {
-            Unsorted.method1250(43, false);
-            System.gc();
-            Class117.method1719(25);
-
-        } catch (RuntimeException var2) {
-            throw ClientErrorException.clientError(var2, "af.D(" + (byte) -86 + ')');
-        }
-    }
-
-    static boolean method835(int var0, int var1, int var2, int var3, int var4, int var5, GameObject var6, long var8) {
-        if (var6 == null) {
-            return true;
-        } else {
-            int var10 = var1 * 128 + 64 * var4;
-            int var11 = var2 * 128 + 64 * var5;
-            return Class56.method1189(var0, var1, var2, var4, var5, var10, var11, var3, var6, 0, false, var8);
-        }
-    }
-
     public final RSString method20(int var1, int[] var2, int var3, long var4) {
         try {
             if (var1 == 0) {
diff --git a/Client/src/main/java/org/runite/client/Class70.java b/Client/src/main/java/org/runite/client/Class70.java
index 9e4b596f1..d2a64e1c0 100644
--- a/Client/src/main/java/org/runite/client/Class70.java
+++ b/Client/src/main/java/org/runite/client/Class70.java
@@ -6,7 +6,6 @@ final class Class70 {
     static int anInt1047;
     static double aDouble1050 = -1.0D;
     static int anInt1053 = 0;
-    static Class10 aClass10_1056;
     int anInt1045;
     long aLong1048 = 0L;
     GameObject aClass140_1049;
@@ -20,7 +19,7 @@ final class Class70 {
     static void method1285(CacheIndex var0, int var2, int var5) {
         try {
             Class101.aClass153_1423 = var0;
-            Class10.anInt154 = 1;
+            Unsorted.anInt154 = 1;
             TextureOperation36.anInt3423 = var5;
             Class132.anInt1741 = 0;
             TextureOperation8.anInt3463 = var2;
diff --git a/Client/src/main/java/org/runite/client/Class75_Sub3.java b/Client/src/main/java/org/runite/client/Class75_Sub3.java
index b6005b052..9a13dc107 100644
--- a/Client/src/main/java/org/runite/client/Class75_Sub3.java
+++ b/Client/src/main/java/org/runite/client/Class75_Sub3.java
@@ -41,7 +41,7 @@ final class Class75_Sub3 extends Class75 {
          Unsorted.aReferenceCache_4043.sweep(5);
          CS2Script.aReferenceCache_2442.sweep(5);
          Class154.aReferenceCache_1964.sweep(5);
-         Class3_Sub28_Sub4.aReferenceCache_3572.sweep(5);
+         QuickChatDefinition.aReferenceCache_3572.sweep(5);
          Class143.aReferenceCache_1874.sweep(5);
          Class67.aReferenceCache_1013.sweep(5);
          Texture.aReferenceCache_1146.sweep(5);
diff --git a/Client/src/main/java/org/runite/client/Class79.java b/Client/src/main/java/org/runite/client/Class79.java
index 08e148d03..633a06817 100644
--- a/Client/src/main/java/org/runite/client/Class79.java
+++ b/Client/src/main/java/org/runite/client/Class79.java
@@ -176,7 +176,7 @@ final class Class79 {
 
     static boolean method1391(int var0) {
         try {
-            return var0 == ~Class10.anInt154 && !Class101.aClass3_Sub24_Sub4_1421.method473(-128);
+            return var0 == ~Unsorted.anInt154 && !Class101.aClass3_Sub24_Sub4_1421.method473(-128);
         } catch (RuntimeException var2) {
             throw ClientErrorException.clientError(var2, "kk.A(" + var0 + ')');
         }
diff --git a/Client/src/main/java/org/runite/client/Class83.java b/Client/src/main/java/org/runite/client/Class83.java
index ce037c435..ac5186d20 100644
--- a/Client/src/main/java/org/runite/client/Class83.java
+++ b/Client/src/main/java/org/runite/client/Class83.java
@@ -6,7 +6,6 @@ import org.rs09.client.rendering.Toolkit;
 public final class Class83 {
 
     static int[] anIntArray1161;
-    static int anInt1156 = 0;
     static boolean aBoolean1158 = false;
     private final CacheIndex aClass153_1153;
     private final HashTable aHashTable_1155 = new HashTable(256);
diff --git a/Client/src/main/java/org/runite/client/Client.java b/Client/src/main/java/org/runite/client/Client.java
index d9c01d14a..5c4afcfe9 100644
--- a/Client/src/main/java/org/runite/client/Client.java
+++ b/Client/src/main/java/org/runite/client/Client.java
@@ -80,7 +80,7 @@ public final class Client extends GameShell {
 
     static void method375(CacheIndex var1, CacheIndex var2) {
         try {
-            Class10.aClass153_152 = var1;
+            Class24.aClass153_152 = var1;
             LoginHandler.aClass153_1680 = var2;
             Class25.anInt497 = LoginHandler.aClass153_1680.getFileAmount(3);
         } catch (RuntimeException var4) {
@@ -103,7 +103,7 @@ public final class Client extends GameShell {
             return null;
         } else {
             for (int var2 = 0; var2 < var1; ++var2) {
-                var0 = Class7.getRSInterface(var0.parentId);
+                var0 = Unsorted.getRSInterface(var0.parentId);
                 if (var0 == null) {
                     return null;
                 }
@@ -594,7 +594,7 @@ public final class Client extends GameShell {
                                 if (inter.anIntArray175 != null && Unsorted.anInt944 - inter.anInt255 <= 32) {
                                     label474:
                                     for (var19 = inter.anInt255; var19 < Unsorted.anInt944; ++var19) {
-                                        var29 = Class3_Sub28_Sub4.anIntArray3565[var19 & 31];
+                                        var29 = QuickChatDefinition.anIntArray3565[var19 & 31];
 
                                         for (var21 = 0; var21 < inter.anIntArray175.length; ++var21) {
                                             if (inter.anIntArray175[var21] == var29) {
@@ -1265,7 +1265,7 @@ public final class Client extends GameShell {
 
                                 var12 = var11.aClass11_2449;
                                 if (0 <= var12.anInt191) {
-                                    var13 = Class7.getRSInterface(var12.parentId);
+                                    var13 = Unsorted.getRSInterface(var12.parentId);
                                     if (var13 == null || null == var13.aClass11Array262 || var12.anInt191 >= var13.aClass11Array262.length || var12 != var13.aClass11Array262[var12.anInt191]) {
                                         continue;
                                     }
@@ -1277,7 +1277,7 @@ public final class Client extends GameShell {
 
                         var12 = var11.aClass11_2449;
                         if (var12.anInt191 >= 0) {
-                            var13 = Class7.getRSInterface(var12.parentId);
+                            var13 = Unsorted.getRSInterface(var12.parentId);
                             if (null == var13 || var13.aClass11Array262 == null || var13.aClass11Array262.length <= var12.anInt191 || var12 != var13.aClass11Array262[var12.anInt191]) {
                                 continue;
                             }
@@ -1289,7 +1289,7 @@ public final class Client extends GameShell {
 
                 var12 = var11.aClass11_2449;
                 if (var12.anInt191 >= 0) {
-                    var13 = Class7.getRSInterface(var12.parentId);
+                    var13 = Unsorted.getRSInterface(var12.parentId);
                     if (null == var13 || null == var13.aClass11Array262 || var12.anInt191 >= var13.aClass11Array262.length || var12 != var13.aClass11Array262[var12.anInt191]) {
                         continue;
                     }
@@ -1610,8 +1610,8 @@ public final class Client extends GameShell {
                             Unsorted.method89(CacheIndex.fontsIndex, CacheIndex.spritesIndex, CacheIndex.interfacesIndex, CacheIndex.modelsIndex);
                             TextureOperation23.method250(CacheIndex.configurationsIndex);
                             EnumDefinitionProvider.setIndex(CacheIndex.clientscriptMaskIndex);
-                            TextureOperation9.method205(CacheIndex.quickchatMenusIndex, CacheIndex.quickchatMessagesIndex, new Class7());
-                            Class65.method1236(CacheIndex.quickchatMenusIndex, CacheIndex.quickchatMessagesIndex);
+                            QuickChat.method205(CacheIndex.quickchatMenusIndex, CacheIndex.quickchatMessagesIndex, new Class7());
+                            QuickChat.method1236(CacheIndex.quickchatMenusIndex, CacheIndex.quickchatMessagesIndex);
                             Class58.method1197(CacheIndex.configurationsIndex);
                             Unsorted.method2065(CacheIndex.configurationsIndex, CacheIndex.spritesIndex);
                             Class107.method1645(CacheIndex.configurationsIndex, CacheIndex.spritesIndex);
diff --git a/Client/src/main/java/org/runite/client/ClientCommands.java b/Client/src/main/java/org/runite/client/ClientCommands.java
index 005fe35a6..7a1ca61a7 100644
--- a/Client/src/main/java/org/runite/client/ClientCommands.java
+++ b/Client/src/main/java/org/runite/client/ClientCommands.java
@@ -213,7 +213,7 @@ public class ClientCommands {
           Unsorted.aReferenceCache_4043.clearSoftReferences();//Class163_Sub2_Sub1.method2222();
           CS2Script.aReferenceCache_2442.clearSoftReferences();//Class163_Sub2_Sub1.method2222();
           Class154.aReferenceCache_1964.clearSoftReferences();//Class163_Sub2_Sub1.method2222();
-          Class3_Sub28_Sub4.aReferenceCache_3572.clearSoftReferences();//Originally Class3_Sub30_Sub1.method813();
+          QuickChatDefinition.aReferenceCache_3572.clearSoftReferences();//Originally Class3_Sub30_Sub1.method813();
           Class143.aReferenceCache_1874.clearSoftReferences();//Originally Class3_Sub30_Sub1.method813();
           Class67.aReferenceCache_1013.clearSoftReferences();//Originally Class3_Sub30_Sub1.method813();
           Texture.aReferenceCache_1146.clearSoftReferences();//Originally Class133.method1803();
diff --git a/Client/src/main/java/org/runite/client/GameObject.java b/Client/src/main/java/org/runite/client/GameObject.java
index 5c6924f3c..df92746ff 100644
--- a/Client/src/main/java/org/runite/client/GameObject.java
+++ b/Client/src/main/java/org/runite/client/GameObject.java
@@ -163,7 +163,7 @@ abstract class GameObject {
     static void method1870() {
         try {
             Class101.aClass3_Sub24_Sub4_1421.method505((byte) -128);
-            Class10.anInt154 = 1;
+            Unsorted.anInt154 = 1;
             Class101.aClass153_1423 = null;
         } catch (RuntimeException var2) {
             throw ClientErrorException.clientError(var2, "th.GC(" + false + ')');
diff --git a/Client/src/main/java/org/runite/client/HDToolKit.java b/Client/src/main/java/org/runite/client/HDToolKit.java
index ac04ded86..8fdaff194 100644
--- a/Client/src/main/java/org/runite/client/HDToolKit.java
+++ b/Client/src/main/java/org/runite/client/HDToolKit.java
@@ -59,7 +59,7 @@ public final class HDToolKit {
     }
 
     static void method1822() {
-        Class3_Sub28_Sub4.method551(0, 0);
+        Unsorted.method551(0, 0);
         method1836();
         method1856(1);
         method1847(1);
@@ -80,7 +80,7 @@ public final class HDToolKit {
     }
 
     static void method1824() {
-        Class3_Sub28_Sub4.method551(0, 0);
+        Unsorted.method551(0, 0);
         method1836();
         method1856(0);
         method1847(0);
@@ -130,7 +130,7 @@ public final class HDToolKit {
     }
 
     static void method1828() {
-        Class3_Sub28_Sub4.method551(0, 0);
+        Unsorted.method551(0, 0);
         method1836();
         method1856(0);
         method1847(0);
@@ -252,7 +252,7 @@ public final class HDToolKit {
     }
 
     public static void method1835() {
-        Class3_Sub28_Sub4.method551(0, 0);
+        Unsorted.method551(0, 0);
         method1836();
         bindTexture2D(-1);
         method1837(false);
diff --git a/Client/src/main/java/org/runite/client/ItemDefinition.java b/Client/src/main/java/org/runite/client/ItemDefinition.java
index 59a4f5203..e230c0faf 100644
--- a/Client/src/main/java/org/runite/client/ItemDefinition.java
+++ b/Client/src/main/java/org/runite/client/ItemDefinition.java
@@ -175,7 +175,7 @@ final class ItemDefinition {
 
 	static ItemDefinition getItemDefinition(int itemId) {
 	   try {
-		  ItemDefinition var2 = (ItemDefinition)Class3_Sub28_Sub4.aReferenceCache_3572.get(itemId);
+		  ItemDefinition var2 = (ItemDefinition) QuickChatDefinition.aReferenceCache_3572.get(itemId);
 		  if(var2 == null) {
 			 byte[] var3 = Class97.aClass153_1370.getFile(Class140_Sub2.method1951(itemId), 255 & itemId);
 			 var2 = new ItemDefinition();
@@ -201,7 +201,7 @@ final class ItemDefinition {
 				var2.groundOptions = Unsorted.aClass94Array2596;
 			 }
 
-			 Class3_Sub28_Sub4.aReferenceCache_3572.put(var2, itemId);
+			 QuickChatDefinition.aReferenceCache_3572.put(var2, itemId);
 		  }
 		  return var2;
 	   } catch (RuntimeException var4) {
diff --git a/Client/src/main/java/org/runite/client/LinkableRSString.java b/Client/src/main/java/org/runite/client/LinkableRSString.java
index 6d27abad2..618310842 100644
--- a/Client/src/main/java/org/runite/client/LinkableRSString.java
+++ b/Client/src/main/java/org/runite/client/LinkableRSString.java
@@ -1,7 +1,6 @@
 package org.runite.client;
 
 import org.rs09.client.Linkable;
-import org.rs09.client.data.NodeCache;
 
 public final class LinkableRSString extends Linkable {
 
@@ -10,7 +9,6 @@ public final class LinkableRSString extends Linkable {
     static CacheIndex aClass153_2581;
     public static int anInt2582 = 0;
     static boolean isDynamicSceneGraph = false;
-    static NodeCache aClass47_3776 = new NodeCache(64);
     public RSString value;
     static int anInt2587;
     static GameShell anApplet_Sub1_2588 = null;
@@ -30,7 +28,7 @@ public final class LinkableRSString extends Linkable {
         try {
 
             try {
-                if (Class10.anInt154 == 1) {
+                if (Unsorted.anInt154 == 1) {
                     int var1 = Class101.aClass3_Sub24_Sub4_1421.method499();
                     if (var1 > 0 && Class101.aClass3_Sub24_Sub4_1421.method473(-124)) {
                         var1 -= GraphicDefinition.anInt546;
@@ -45,11 +43,11 @@ public final class LinkableRSString extends Linkable {
                     Class101.aClass3_Sub24_Sub4_1421.method505((byte) -128);
                     Class101.aClass3_Sub24_Sub4_1421.method485();
                     NPC.aClass3_Sub27_1154 = null;
-                    Class3_Sub28_Sub4.aClass83_3579 = null;
+                    QuickChatDefinition.aClass83_3579 = null;
                     if (Class101.aClass153_1423 == null) {
-                        Class10.anInt154 = 0;
+                        Unsorted.anInt154 = 0;
                     } else {
-                        Class10.anInt154 = 2;
+                        Unsorted.anInt154 = 2;
                     }
                 }
             } catch (Exception var2) {
@@ -57,8 +55,8 @@ public final class LinkableRSString extends Linkable {
                 Class101.aClass3_Sub24_Sub4_1421.method505((byte) -127);
                 Class101.aClass153_1423 = null;
                 NPC.aClass3_Sub27_1154 = null;
-                Class10.anInt154 = 0;
-                Class3_Sub28_Sub4.aClass83_3579 = null;
+                Unsorted.anInt154 = 0;
+                QuickChatDefinition.aClass83_3579 = null;
             }
 
         } catch (RuntimeException var3) {
@@ -120,35 +118,6 @@ public final class LinkableRSString extends Linkable {
     public LinkableRSString() {
     }
 
-    static Class3_Sub28_Sub4 method733(int var1) {
-        try {
-            Class3_Sub28_Sub4 var2 = (Class3_Sub28_Sub4) aClass47_3776.get(var1);
-            if (null == var2) {
-                byte[] var3;
-                if (var1 < 32768) {
-                    var3 = Class3_Sub24_Sub3.aClass153_3490.getFile(1, var1);
-                } else {
-                    var3 = TextureOperation9.aClass153_1967.getFile(1, 32767 & var1);
-                }
-
-                var2 = new Class3_Sub28_Sub4();
-
-                if (var3 != null) {
-                    var2.method546(new DataBuffer(var3));
-                }
-
-                if (var1 >= 32768) {
-                    var2.method548();
-                }
-
-                aClass47_3776.put(var1, var2);
-            }
-            return var2;
-        } catch (RuntimeException var4) {
-            throw ClientErrorException.clientError(var4, "sj.Q(" + 12345678 + ',' + var1 + ')');
-        }
-    }
-
     static void method734(RSString var1) {
         try {
             Class163_Sub2.paramSettings = var1;
@@ -160,7 +129,7 @@ public final class LinkableRSString extends Linkable {
                     if (0 == var1.length()) {
                         var4 = RSString.stringCombiner(new RSString[]{var4, TextCore.HasAgeExpire});
                     } else {
-                        var4 = RSString.stringCombiner(new RSString[]{var4, TextCore.HasExpires, Class15.method894(94608000000L + TimeUtils.time()), TextCore.HasMaxAge, Class3_Sub28_Sub4.method612(94608000L)});
+                        var4 = RSString.stringCombiner(new RSString[]{var4, TextCore.HasExpires, Class15.method894(94608000000L + TimeUtils.time()), TextCore.HasMaxAge, QuickChatDefinition.method612(94608000L)});
                     }
 
                     RSString.stringCombiner(new RSString[]{TextCore.aClass94_1694, var4, TextCore.aClass94_1698}).method1554(Class38.signlink.gameApplet);
@@ -179,7 +148,7 @@ public final class LinkableRSString extends Linkable {
                 method736(-60, -93);
             }
 
-            if (Class10.anInt154 == 0) {
+            if (Unsorted.anInt154 == 0) {
                 Class101.aClass3_Sub24_Sub4_1421.method506(var0);
             } else {
                 TextureOperation36.anInt3423 = var0;
diff --git a/Client/src/main/java/org/runite/client/NPC.java b/Client/src/main/java/org/runite/client/NPC.java
index 499f304c5..b07ce3934 100644
--- a/Client/src/main/java/org/runite/client/NPC.java
+++ b/Client/src/main/java/org/runite/client/NPC.java
@@ -66,7 +66,7 @@ public final class NPC extends Class140_Sub4 {
     static boolean method1988() {
         try {
             try {
-                if (Class10.anInt154 == 2) {
+                if (Unsorted.anInt154 == 2) {
                     if (aClass3_Sub27_1154 == null) {
                         aClass3_Sub27_1154 = Class3_Sub27.method517(Class101.aClass153_1423, TextureOperation8.anInt3463, Class132.anInt1741);
                         if (null == aClass3_Sub27_1154) {
@@ -74,17 +74,17 @@ public final class NPC extends Class140_Sub4 {
                         }
                     }
 
-                    if (Class3_Sub28_Sub4.aClass83_3579 == null) {
-                        Class3_Sub28_Sub4.aClass83_3579 = new Class83(Class40.aClass153_679, Class3_Sub28_Sub20.aClass153_3786);
+                    if (QuickChatDefinition.aClass83_3579 == null) {
+                        QuickChatDefinition.aClass83_3579 = new Class83(Class40.aClass153_679, Class3_Sub28_Sub20.aClass153_3786);
                     }
 
-                    if (Class101.aClass3_Sub24_Sub4_1421.method470(aClass3_Sub27_1154, Class124.aClass153_1661, Class3_Sub28_Sub4.aClass83_3579)) {
+                    if (Class101.aClass3_Sub24_Sub4_1421.method470(aClass3_Sub27_1154, Class124.aClass153_1661, QuickChatDefinition.aClass83_3579)) {
                         Class101.aClass3_Sub24_Sub4_1421.method471();
                         Class101.aClass3_Sub24_Sub4_1421.method506(TextureOperation36.anInt3423);
                         Class101.aClass3_Sub24_Sub4_1421.method490(Unsorted.aBoolean2311, aClass3_Sub27_1154);
-                        Class10.anInt154 = 0;
+                        Unsorted.anInt154 = 0;
                         aClass3_Sub27_1154 = null;
-                        Class3_Sub28_Sub4.aClass83_3579 = null;
+                        QuickChatDefinition.aClass83_3579 = null;
                         Class101.aClass153_1423 = null;
                         return true;
                     }
@@ -94,8 +94,8 @@ public final class NPC extends Class140_Sub4 {
                 Class101.aClass3_Sub24_Sub4_1421.method505((byte) -128);
                 Class101.aClass153_1423 = null;
                 aClass3_Sub27_1154 = null;
-                Class10.anInt154 = 0;
-                Class3_Sub28_Sub4.aClass83_3579 = null;
+                Unsorted.anInt154 = 0;
+                QuickChatDefinition.aClass83_3579 = null;
             }
 
             return false;
diff --git a/Client/src/main/java/org/runite/client/PacketParser.java b/Client/src/main/java/org/runite/client/PacketParser.java
index fbeb0ac8e..aa161ec1c 100644
--- a/Client/src/main/java/org/runite/client/PacketParser.java
+++ b/Client/src/main/java/org/runite/client/PacketParser.java
@@ -319,7 +319,7 @@ public final class PacketParser {
                                 if (!var63 && 0 == inTutorialIsland) {
                                     Class163_Sub2_Sub1.aLongArray4017[MouseListeningClass.anInt1921] = var55;
                                     MouseListeningClass.anInt1921 = (1 + MouseListeningClass.anInt1921) % 100;
-                                    RSString var61 = LinkableRSString.method733(var11).method555(BufferedDataStream.incomingBuffer);
+                                    RSString var61 = QuickChat.method733(var11).method555(BufferedDataStream.incomingBuffer);
                                     if (clanChatIcon == 2 || 3 == clanChatIcon) {
                                         MessageManager.sendGameMessage(var11, 20, var61, Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), RSString.stringCombiner(new RSString[]{RSString.parse("<img=1>"), Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}));
                                     } else if (clanChatIcon == 1) {
@@ -460,7 +460,7 @@ public final class PacketParser {
                                         modelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE128();
                                         Class146.updateInterfacePacketCounter(modelId);
                                         if (var19 == 2) {
-                                            Class7.method834();
+                                            method834();
                                         }
                                         ConfigInventoryDefinition.anInt3655 = nodeModelId;
                                         TextureOperation20.method232(nodeModelId);
@@ -485,7 +485,7 @@ public final class PacketParser {
                                     } else if (141 == Unsorted.incomingOpcode) { //UNUSED BY SERVER
                                         var2 = BufferedDataStream.incomingBuffer.readLong();
                                         modelId = BufferedDataStream.incomingBuffer.readUnsignedShort();
-                                        var56 = LinkableRSString.method733(modelId).method555(BufferedDataStream.incomingBuffer);
+                                        var56 = QuickChat.method733(modelId).method555(BufferedDataStream.incomingBuffer);
                                         MessageManager.sendGameMessage(modelId, 19, var56, null, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString());
                                         Unsorted.incomingOpcode = -1;
                                         return true;
@@ -545,7 +545,7 @@ public final class PacketParser {
                                                     var38 = new Class3_Sub1(var47.anInt2205, nodeModelId);
                                                     var47.unlink();
                                                 } else if (var30 == -1) {
-                                                    var38 = new Class3_Sub1(Objects.requireNonNull(Class7.getRSInterface(var19)).aClass3_Sub1_257.anInt2205, nodeModelId);
+                                                    var38 = new Class3_Sub1(Objects.requireNonNull(Unsorted.getRSInterface(var19)).aClass3_Sub1_257.anInt2205, nodeModelId);
                                                 } else {
                                                     var38 = new Class3_Sub1(0, nodeModelId);
                                                 }
@@ -765,7 +765,7 @@ public final class PacketParser {
                                                 return true;
                                             } else if (Unsorted.incomingOpcode == 144) {
                                                 nodeModelId = BufferedDataStream.incomingBuffer.readIntV2();
-                                                RSInterface var65 = Class7.getRSInterface(nodeModelId);
+                                                RSInterface var65 = Unsorted.getRSInterface(nodeModelId);
 
                                                 for (modelId = 0; Objects.requireNonNull(var65).itemAmounts.length > modelId; ++modelId) {
                                                     var65.itemAmounts[modelId] = -1;
@@ -959,7 +959,7 @@ public final class PacketParser {
                                                     if (!var49 && inTutorialIsland == 0) {
                                                         Class163_Sub2_Sub1.aLongArray4017[MouseListeningClass.anInt1921] = var51;
                                                         MouseListeningClass.anInt1921 = (1 + MouseListeningClass.anInt1921) % 100;
-                                                        var64 = LinkableRSString.method733(var33).method555(BufferedDataStream.incomingBuffer);
+                                                        var64 = QuickChat.method733(var33).method555(BufferedDataStream.incomingBuffer);
                                                         if (chatIcon == 2) {
                                                             MessageManager.sendGameMessage(var33, 18, var64, null, RSString.stringCombiner(new RSString[]{RSString.parse("<img=1>"), Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}));
                                                         } else if (1 == chatIcon) {
@@ -989,12 +989,12 @@ public final class PacketParser {
                                                             TextureOperation23.aHashTable_3208.put(modelId, var23);
                                                         }
 
-                                                        RSInterface var27 = Class7.getRSInterface(nodeModelId);
+                                                        RSInterface var27 = Unsorted.getRSInterface(nodeModelId);
                                                         if (var27 != null) {
                                                             Class20.method909(var27);
                                                         }
 
-                                                        var27 = Class7.getRSInterface(modelId);
+                                                        var27 = Unsorted.getRSInterface(modelId);
                                                         if (null != var27) {
                                                             Class20.method909(var27);
                                                             Unsorted.method2104(var27, true, 48);
@@ -1065,7 +1065,7 @@ public final class PacketParser {
                                                     } else if (Unsorted.incomingOpcode == 191) {
                                                         nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE();
                                                         Class3_Sub28_Sub1.method532(nodeModelId);
-                                                        Class3_Sub28_Sub4.anIntArray3565[Unsorted.bitwiseAnd(31, Unsorted.anInt944++)] = Unsorted.bitwiseAnd(nodeModelId, 32767);
+                                                        QuickChatDefinition.anIntArray3565[Unsorted.bitwiseAnd(31, Unsorted.anInt944++)] = Unsorted.bitwiseAnd(nodeModelId, 32767);
                                                         Unsorted.incomingOpcode = -1;
                                                         return true;
                                                     } else if (Unsorted.incomingOpcode == 102) {
@@ -1412,7 +1412,7 @@ public final class PacketParser {
                                                             if (nodeModelId < 0) {
                                                                 var25 = null;
                                                             } else {
-                                                                var25 = Class7.getRSInterface(nodeModelId);
+                                                                var25 = Unsorted.getRSInterface(nodeModelId);
                                                             }
 
                                                             for (; Unsorted.incomingPacketLength > BufferedDataStream.incomingBuffer.index; Class168.method2277(var6 + -1, counter, var30, var19, (byte) 46)) {
@@ -1437,7 +1437,7 @@ public final class PacketParser {
                                                             }
 
                                                             BufferedDataStream.method819();
-                                                            Class3_Sub28_Sub4.anIntArray3565[Unsorted.bitwiseAnd(Unsorted.anInt944++, 31)] = Unsorted.bitwiseAnd(32767, var19);
+                                                            QuickChatDefinition.anIntArray3565[Unsorted.bitwiseAnd(Unsorted.anInt944++, 31)] = Unsorted.bitwiseAnd(32767, var19);
                                                             Unsorted.incomingOpcode = -1;
                                                             return true;
                                                         } else if (Unsorted.incomingOpcode == 24) {
@@ -1503,7 +1503,7 @@ public final class PacketParser {
                                                                 var47 = (Class3_Sub1) Class124.aHashTable_1659.get(var36);
                                                                 if (var47 == null) {
                                                                     if (-1 == var30) {
-                                                                        var38 = new Class3_Sub1(var6, Objects.requireNonNull(Class7.getRSInterface(modelId)).aClass3_Sub1_257.anInt2202);
+                                                                        var38 = new Class3_Sub1(var6, Objects.requireNonNull(Unsorted.getRSInterface(modelId)).aClass3_Sub1_257.anInt2202);
                                                                     } else {
                                                                         var38 = new Class3_Sub1(var6, -1);
                                                                     }
@@ -1611,7 +1611,7 @@ public final class PacketParser {
 
                                                             counter = BufferedDataStream.incomingBuffer.readUnsignedShortLE();
                                                             Class146.updateInterfacePacketCounter(counter);
-                                                            RSInterface var34 = Class7.getRSInterface(var19);
+                                                            RSInterface var34 = Unsorted.getRSInterface(var19);
                                                             ItemDefinition var43;
                                                             if (Objects.requireNonNull(var34).usingScripts) {
                                                                 Class140_Sub6.method2026(var19, nodeModelId, modelId);
@@ -1644,7 +1644,7 @@ public final class PacketParser {
                                                             }
 
                                                             if (0 <= nodeModelId) {
-                                                                var25 = Class7.getRSInterface(nodeModelId);
+                                                                var25 = Unsorted.getRSInterface(nodeModelId);
                                                             } else {
                                                                 var25 = null;
                                                             }
@@ -1656,7 +1656,7 @@ public final class PacketParser {
                                                                 }
                                                             }
 
-                                                            Class10.method852((byte) 114, var19);
+                                                            CS2Methods.method852(var19);
                                                             counter = BufferedDataStream.incomingBuffer.readUnsignedShort();
 
                                                             for (var6 = 0; counter > var6; ++var6) {
@@ -1679,7 +1679,7 @@ public final class PacketParser {
                                                             }
 
                                                             BufferedDataStream.method819();
-                                                            Class3_Sub28_Sub4.anIntArray3565[Unsorted.bitwiseAnd(Unsorted.anInt944++, 31)] = Unsorted.bitwiseAnd(32767, var19);
+                                                            QuickChatDefinition.anIntArray3565[Unsorted.bitwiseAnd(Unsorted.anInt944++, 31)] = Unsorted.bitwiseAnd(32767, var19);
                                                             Unsorted.incomingOpcode = -1;
                                                             return true;
                                                         } else if (Unsorted.incomingOpcode == 142) {
@@ -1838,4 +1838,15 @@ public final class PacketParser {
             throw ClientErrorException.clientError(var4, "ni.B(" + 255 + ',' + (var1 != null ? "{...}" : "null") + ',' + var2 + ')');
         }
     }
+
+    static void method834() {
+        try {
+            Unsorted.method1250(43, false);
+            System.gc();
+            Class117.method1719(25);
+
+        } catch (RuntimeException var2) {
+            throw ClientErrorException.clientError(var2, "af.D(" + (byte) -86 + ')');
+        }
+    }
 }
diff --git a/Client/src/main/java/org/runite/client/PlayerRendering.java b/Client/src/main/java/org/runite/client/PlayerRendering.java
index c7495b132..0e6a38b65 100644
--- a/Client/src/main/java/org/runite/client/PlayerRendering.java
+++ b/Client/src/main/java/org/runite/client/PlayerRendering.java
@@ -230,10 +230,10 @@ public final class PlayerRendering {
                         int var13 = -1;
                         RSString message;
                         if (var8) {
-                            Class10 var14 = Class155.method2156(playerRenderBuffer);
+                            QuickChat var14 = QuickChat.method2156(playerRenderBuffer);
                             var4 &= 32767;
                             var13 = var14.anInt149;
-                            message = var14.aClass3_Sub28_Sub4_151.method555(playerRenderBuffer);
+                            message = var14.aQuickChatDefinition_151.method555(playerRenderBuffer);
                         } else {
                             message = Font.method686(Objects.requireNonNull(Class32.method992(playerRenderBuffer).properlyCapitalize()));
                         }
diff --git a/Client/src/main/java/org/runite/client/QuickChat.java b/Client/src/main/java/org/runite/client/QuickChat.java
index ccd93f9bf..dab937864 100644
--- a/Client/src/main/java/org/runite/client/QuickChat.java
+++ b/Client/src/main/java/org/runite/client/QuickChat.java
@@ -2,9 +2,76 @@ package org.runite.client;
 
 import org.rs09.client.data.NodeCache;
 
-public class QuickChat {
+final class QuickChat {
 
+    static CacheIndex aClass153_1967;
+    static CacheIndex aClass153_3490;
     static NodeCache aClass47_3137 = new NodeCache(64);
+    static NodeCache aClass47_3776 = new NodeCache(64);
+    static int anInt377 = 0;
+    static int anInt1156 = 0;
+
+    int anInt149;
+    QuickChatDefinition aQuickChatDefinition_151;
+    int[] anIntArray153;
+
+    static void method205(CacheIndex quickchatMenusIndex, CacheIndex quickchatMessagesIndex, Interface4 var3) {
+        try {
+            aClass153_1967 = quickchatMenusIndex;
+            Class58.anInterface4_915 = var3;
+            aClass153_3490 = quickchatMessagesIndex;
+            if (aClass153_3490 != null) {
+                anInt1156 = aClass153_3490.getFileAmount(1);
+            }
+
+            if (aClass153_1967 != null) {
+                anInt377 = aClass153_1967.getFileAmount(1);
+            }
+        } catch (RuntimeException var5) {
+            throw ClientErrorException.clientError(var5, "ej.E(" + (quickchatMenusIndex != null ? "{...}" : "null") + ',' + 115 + ',' + (quickchatMessagesIndex != null ? "{...}" : "null") + ',' + (var3 != null ? "{...}" : "null") + ')');
+        }
+    }
+
+    static QuickChatDefinition method733(int var1) {
+        try {
+            QuickChatDefinition var2 = (QuickChatDefinition) aClass47_3776.get(var1);
+            if (null == var2) {
+                byte[] var3;
+                if (var1 < 32768) {
+                    var3 = aClass153_3490.getFile(1, var1);
+                } else {
+                    var3 = aClass153_1967.getFile(1, 32767 & var1);
+                }
+
+                var2 = new QuickChatDefinition();
+
+                if (var3 != null) {
+                    var2.decode(new DataBuffer(var3));
+                }
+
+                if (var1 >= 32768) {
+                    var2.method548();
+                }
+
+                aClass47_3776.put(var1, var2);
+            }
+            return var2;
+        } catch (RuntimeException var4) {
+            throw ClientErrorException.clientError(var4, "sj.Q(" + 12345678 + ',' + var1 + ')');
+        }
+    }
+
+    static QuickChat method2156(DataBuffer var1) {
+        try {
+            QuickChat var2 = new QuickChat();
+            var2.anInt149 = var1.readUnsignedShort();
+
+            var2.aQuickChatDefinition_151 = method733(var2.anInt149);
+            return var2;
+        } catch (RuntimeException var3) {
+            throw ClientErrorException.clientError(var3, "vh.M(" + 1024 + ',' + (var1 != null ? "{...}" : "null") + ')');
+        }
+    }
 
     static Class3_Sub28_Sub1 getQuickChatMessage(int fileId) {
         try {
@@ -33,4 +100,13 @@ public class QuickChat {
             throw ClientErrorException.clientError(var4, "tb.B(" + fileId + ',' + (byte) -54 + ')');
         }
     }
+
+    static void method1236(CacheIndex var0, CacheIndex var1) {
+        try {
+            Unsorted.quickChatMessages = var1;
+            Unsorted.aClass153_332 = var0;
+        } catch (RuntimeException var4) {
+            throw ClientErrorException.clientError(var4, "ja.F(" + (var0 != null ? "{...}" : "null") + ',' + (var1 != null ? "{...}" : "null") + ',' + -117 + ')');
+        }
+    }
 }
diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub4.java b/Client/src/main/java/org/runite/client/QuickChatDefinition.java
similarity index 78%
rename from Client/src/main/java/org/runite/client/Class3_Sub28_Sub4.java
rename to Client/src/main/java/org/runite/client/QuickChatDefinition.java
index a9cb8d823..4666101ed 100644
--- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub4.java
+++ b/Client/src/main/java/org/runite/client/QuickChatDefinition.java
@@ -5,7 +5,7 @@ import org.rs09.client.data.ReferenceCache;
 
 import java.util.Objects;
 
-final class Class3_Sub28_Sub4 extends Node {
+final class QuickChatDefinition extends Node {
 
    static int[] anIntArray3565 = new int[32];
    static int[] anIntArray2209 = new int[]{2, 2, 4, 2, 1, 8, 4, 1, 4, 4, 2, 1, 1, 1, 4, 1};
@@ -22,6 +22,57 @@ final class Class3_Sub28_Sub4 extends Node {
        return TextureOperation9.method207(10, false, 116, var0);
    }
 
+   final void decode(DataBuffer buffer) {
+
+      while(true) {
+         int var3 = buffer.readUnsignedByte();
+         if(0 == var3) {
+            return;
+         }
+
+         this.decode(buffer, var3);
+      }
+   }
+
+   private void decode(DataBuffer var1, int var2) {
+      try {
+
+         if(var2 == 1) {
+            this.aClass94Array3571 = var1.readString().method1567(60, (byte)118);
+         } else {
+            int var4;
+            int var5;
+            if(var2 == 2) {
+               var4 = var1.readUnsignedByte();
+               this.anIntArray3567 = new int[var4];
+
+               for(var5 = 0; var5 < var4; ++var5) {
+                  this.anIntArray3567[var5] = var1.readUnsignedShort();
+               }
+            } else if (var2 == 3) {
+               var4 = var1.readUnsignedByte();
+               this.anIntArray3566 = new int[var4];
+               this.anIntArrayArray3570 = new int[var4][];
+
+               for (var5 = 0; var4 > var5; ++var5) {
+                  int var6 = var1.readUnsignedShort();
+                  this.anIntArray3566[var5] = var6;
+                  this.anIntArrayArray3570[var5] = new int[anIntArray1976[var6]];
+
+                  for (int var7 = 0; anIntArray1976[var6] > var7; ++var7) {
+                     this.anIntArrayArray3570[var5][var7] = var1.readUnsignedShort();
+                  }
+               }
+            } else if (var2 == 4) {
+               this.aBoolean3568 = false;
+            }
+         }
+
+      } catch (RuntimeException var8) {
+         throw ClientErrorException.clientError(var8, "cb.R(" + (var1 != null?"{...}":"null") + ',' + var2 + ',' + -14637 + ')');
+      }
+   }
+
    final void method545(DataBuffer var1, int[] var2) {
       try {
          if(this.anIntArray3566 != null) {
@@ -38,22 +89,6 @@ final class Class3_Sub28_Sub4 extends Node {
       }
    }
 
-   final void method546(DataBuffer var1) {
-      try {
-         while(true) {
-            int var3 = var1.readUnsignedByte();
-            if(0 == var3) {
-
-               return;
-            }
-
-            this.method553(var1, var3);
-         }
-      } catch (RuntimeException var4) {
-         throw ClientErrorException.clientError(var4, "cb.D(" + (var1 != null?"{...}":"null") + ',' + -1 + ')');
-      }
-   }
-
    final void method548() {
       try {
          if(null != this.anIntArray3567) {
@@ -88,42 +123,6 @@ final class Class3_Sub28_Sub4 extends Node {
       }
    }
 
-   static void method551(int var1, int var2) {
-      try {
-         if(4 == var2 && !Class128.aBoolean1685) {
-            var2 = 2;
-            var1 = 2;
-         }
-
-         if(var2 == Class23.anInt453) {
-            if(0 != var2 && var1 != TextureOperation37.anInt3263) {
-               Unsorted.anShaderInterfaceArray70[var2].method23(var1);
-               TextureOperation37.anInt3263 = var1;
-            }
-         } else {
-            if(TextureOperation23.aBoolean3207) {
-               return;
-            }
-
-            if(Class23.anInt453 != 0) {
-               Unsorted.anShaderInterfaceArray70[Class23.anInt453].method21();
-            }
-
-            if(var2 != 0) {
-               ShaderInterface var3 = Unsorted.anShaderInterfaceArray70[var2];
-               var3.method22();
-               var3.method23(var1);
-            }
-
-            Class23.anInt453 = var2;
-            TextureOperation37.anInt3263 = var1;
-         }
-
-      } catch (RuntimeException var4) {
-         throw ClientErrorException.clientError(var4, "cb.A(" + 0 + ',' + var1 + ',' + var2 + ')');
-      }
-   }
-
    final int method552() {
       try {
          return (this.anIntArray3566 != null?this.anIntArray3566.length:0);
@@ -132,45 +131,6 @@ final class Class3_Sub28_Sub4 extends Node {
       }
    }
 
-   private void method553(DataBuffer var1, int var2) {
-      try {
-
-         if(var2 == 1) {
-            this.aClass94Array3571 = var1.readString().method1567(60, (byte)118);
-         } else {
-            int var4;
-            int var5;
-            if(var2 == 2) {
-               var4 = var1.readUnsignedByte();
-               this.anIntArray3567 = new int[var4];
-
-               for(var5 = 0; var5 < var4; ++var5) {
-                  this.anIntArray3567[var5] = var1.readUnsignedShort();
-               }
-            } else if (var2 == 3) {
-               var4 = var1.readUnsignedByte();
-               this.anIntArray3566 = new int[var4];
-               this.anIntArrayArray3570 = new int[var4][];
-
-               for (var5 = 0; var4 > var5; ++var5) {
-                  int var6 = var1.readUnsignedShort();
-                  this.anIntArray3566[var5] = var6;
-                  this.anIntArrayArray3570[var5] = new int[anIntArray1976[var6]];
-
-                  for (int var7 = 0; anIntArray1976[var6] > var7; ++var7) {
-                     this.anIntArrayArray3570[var5][var7] = var1.readUnsignedShort();
-                  }
-               }
-            } else if (var2 == 4) {
-               this.aBoolean3568 = false;
-            }
-         }
-
-      } catch (RuntimeException var8) {
-         throw ClientErrorException.clientError(var8, "cb.R(" + (var1 != null?"{...}":"null") + ',' + var2 + ',' + -14637 + ')');
-      }
-   }
-
    final RSString method554() {
       try {
          RSString var2 = Unsorted.emptyString(80);
diff --git a/Client/src/main/java/org/runite/client/RSInterface.java b/Client/src/main/java/org/runite/client/RSInterface.java
index c34b4a939..98b264c3c 100644
--- a/Client/src/main/java/org/runite/client/RSInterface.java
+++ b/Client/src/main/java/org/runite/client/RSInterface.java
@@ -1030,11 +1030,11 @@ public final class RSInterface {
         }
     }
 
-    static int method869(int var0, int var1) {
+    static int method869(int var1) {
         try {
-            return var1 != 16711935 ? (var0 < 97 ? -63 : Class56.method1186(var1)) : -1;
+            return var1 != 16711935 ? Class56.method1186(var1) : -1;
         } catch (RuntimeException var3) {
-            throw ClientErrorException.clientError(var3, "be.D(" + var0 + ',' + var1 + ')');
+            throw ClientErrorException.clientError(var3, "be.D(" + 116 + ',' + var1 + ')');
         }
     }
 
diff --git a/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java b/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java
index a1cb043da..bf314cfec 100644
--- a/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java
+++ b/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java
@@ -19,7 +19,6 @@ final class RenderAnimationDefinition {
     int slow_walk_follow_full_turn_anim = -1;
     int run_follow_ccw_turn_anim = -1;
     int run_follow_cw_turn_anim = -1;
-    static int anInt377 = 0;
     static RSString aClass94_378 = null;
     int slow_walk_follow_cw_turn_anim = -1;
     int hill_height = 0;
diff --git a/Client/src/main/java/org/runite/client/TextureOperation19.java b/Client/src/main/java/org/runite/client/TextureOperation19.java
index 8abe847ac..62d1a8738 100644
--- a/Client/src/main/java/org/runite/client/TextureOperation19.java
+++ b/Client/src/main/java/org/runite/client/TextureOperation19.java
@@ -23,7 +23,7 @@ final class TextureOperation19 extends TextureOperation {
          }
 
          Class164_Sub2.method2249(var3);
-         RSInterface var5 = Class7.getRSInterface(var4);
+         RSInterface var5 = Unsorted.getRSInterface(var4);
          if(null != var5) {
             Class20.method909(var5);
          }
diff --git a/Client/src/main/java/org/runite/client/TextureOperation20.java b/Client/src/main/java/org/runite/client/TextureOperation20.java
index a4802dad9..9a40eb26a 100644
--- a/Client/src/main/java/org/runite/client/TextureOperation20.java
+++ b/Client/src/main/java/org/runite/client/TextureOperation20.java
@@ -458,13 +458,13 @@ final class TextureOperation20 extends TextureOperation {
                         } else {
                            RSInterface var20;
                            if(var3 == 3) {
-                              var20 = Class7.getRSInterface(var4);
+                              var20 = Unsorted.getRSInterface(var4);
                               if(!var16.text.equalsString(Objects.requireNonNull(var20).text)) {
                                  var20.text = var16.text;
                                  Class20.method909(var20);
                               }
                            } else if (var3 == 4) {
-                              var20 = Class7.getRSInterface(var4);
+                              var20 = Unsorted.getRSInterface(var4);
                               var6 = var16.anInt3598;
                               var8 = var16.anInt3596;
                               nodeModelID = var16.anInt3597;
@@ -475,7 +475,7 @@ final class TextureOperation20 extends TextureOperation {
                                  Class20.method909(var20);
                               }
                            } else if (var3 == 5) {
-                              var20 = Class7.getRSInterface(var4);
+                              var20 = Unsorted.getRSInterface(var4);
                               if (var16.anInt3598 != Objects.requireNonNull(var20).animationId || var16.anInt3598 == -1) {
                                  var20.anInt260 = 1;
                                  var20.anInt267 = 0;
@@ -488,21 +488,21 @@ final class TextureOperation20 extends TextureOperation {
                               var6 = (32195 & var5) >> 10;
                               var8 = var5 & 31;
                               nodeModelID = (var5 & 1000) >> 5;
-                              RSInterface var10 = Class7.getRSInterface(var4);
+                              RSInterface var10 = Unsorted.getRSInterface(var4);
                               var9 = (var8 << 3) + (nodeModelID << 11) + (var6 << 19);
                               if (Objects.requireNonNull(var10).anInt218 != var9) {
                                  var10.anInt218 = var9;
                                  Class20.method909(var10);
                               }
                            } else if (var3 == 7) {
-                              var20 = Class7.getRSInterface(var4);
+                              var20 = Unsorted.getRSInterface(var4);
                               boolean var24 = var16.anInt3598 == 1;
                               if (var20 != null && var24 == !var20.hidden) {
                                  var20.hidden = var24;
                                  Class20.method909(var20);
                               }
                            } else if (var3 == 8) {
-                              var20 = Class7.getRSInterface(var4);
+                              var20 = Unsorted.getRSInterface(var4);
                               if (var16.anInt3598 != Objects.requireNonNull(var20).anInt182 || var20.anInt308 != var16.anInt3597 || var20.anInt164 != var16.anInt3596) {
                                  var20.anInt182 = var16.anInt3598;
                                  var20.anInt164 = var16.anInt3596;
@@ -520,14 +520,14 @@ final class TextureOperation20 extends TextureOperation {
                                  Class20.method909(var20);
                               }
                            } else if (var3 == 9) {
-                              var20 = Class7.getRSInterface(var4);
+                              var20 = Unsorted.getRSInterface(var4);
                               if (Objects.requireNonNull(var20).anInt192 != var16.anInt3598 || var20.anInt271 != var16.anInt3597) {
                                  var20.anInt192 = var16.anInt3598;
                                  var20.anInt271 = var16.anInt3597;
                                  Class20.method909(var20);
                               }
                            } else if (var3 == 10) {
-                              var20 = Class7.getRSInterface(var4);
+                              var20 = Unsorted.getRSInterface(var4);
                               if (var16.anInt3598 != Objects.requireNonNull(var20).anInt258 || var20.anInt264 != var16.anInt3597 || var20.anInt280 != var16.anInt3596) {
                                  var20.anInt264 = var16.anInt3597;
                                  var20.anInt280 = var16.anInt3596;
@@ -535,14 +535,14 @@ final class TextureOperation20 extends TextureOperation {
                                  Class20.method909(var20);
                               }
                            } else if (var3 == 11) {
-                              var20 = Class7.getRSInterface(var4);
+                              var20 = Unsorted.getRSInterface(var4);
                               Objects.requireNonNull(var20).anInt306 = var20.defX = var16.anInt3598;
                               var20.horizontalPos = 0;
                               var20.verticalPos = 0;
                               var20.anInt210 = var20.defY = var16.anInt3597;
                               Class20.method909(var20);
                            } else if (var3 == 12) {
-                              var20 = Class7.getRSInterface(var4);
+                              var20 = Unsorted.getRSInterface(var4);
                               var6 = var16.anInt3598;
                               if (null != var20 && 0 == var20.type) {
                                  if (var6 > var20.anInt252 + -var20.height) {
@@ -559,7 +559,7 @@ final class TextureOperation20 extends TextureOperation {
                                  }
                               }
                            } else if (var3 == 13) {
-                              var20 = Class7.getRSInterface(var4);
+                              var20 = Unsorted.getRSInterface(var4);
                               Objects.requireNonNull(var20).anInt237 = var16.anInt3598;
                            }
                         }
@@ -895,7 +895,7 @@ final class TextureOperation20 extends TextureOperation {
 
                                     var25 = var26.aClass11_2449;
                                     if(var25.anInt191 >= 0) {
-                                       var23 = Class7.getRSInterface(var25.parentId);
+                                       var23 = Unsorted.getRSInterface(var25.parentId);
                                        if(null == var23 || var23.aClass11Array262 == null || var23.aClass11Array262.length <= var25.anInt191 || var25 != var23.aClass11Array262[var25.anInt191]) {
                                           continue;
                                        }
@@ -907,7 +907,7 @@ final class TextureOperation20 extends TextureOperation {
 
                               var25 = var26.aClass11_2449;
                               if(var25.anInt191 >= 0) {
-                                 var23 = Class7.getRSInterface(var25.parentId);
+                                 var23 = Unsorted.getRSInterface(var25.parentId);
                                  if(var23 == null || null == var23.aClass11Array262 || var23.aClass11Array262.length <= var25.anInt191 || var23.aClass11Array262[var25.anInt191] != var25) {
                                     continue;
                                  }
@@ -919,7 +919,7 @@ final class TextureOperation20 extends TextureOperation {
 
                         var25 = var26.aClass11_2449;
                         if(var25.anInt191 >= 0) {
-                           var23 = Class7.getRSInterface(var25.parentId);
+                           var23 = Unsorted.getRSInterface(var25.parentId);
                            if(var23 == null || var23.aClass11Array262 == null || var25.anInt191 >= var23.aClass11Array262.length || var23.aClass11Array262[var25.anInt191] != var25) {
                               continue;
                            }
diff --git a/Client/src/main/java/org/runite/client/TextureOperation9.java b/Client/src/main/java/org/runite/client/TextureOperation9.java
index ba24e3b8f..7acca5668 100644
--- a/Client/src/main/java/org/runite/client/TextureOperation9.java
+++ b/Client/src/main/java/org/runite/client/TextureOperation9.java
@@ -6,8 +6,7 @@ import java.util.Objects;
 
 public final class TextureOperation9 extends TextureOperation {
 
-    static CacheIndex aClass153_1967;
-    private boolean aBoolean3100 = true;
+	private boolean aBoolean3100 = true;
 	public static int anInt3102 = 0;
 	static int anInt3103;
 	private boolean aBoolean3104 = true;
@@ -117,23 +116,6 @@ public final class TextureOperation9 extends TextureOperation {
 		}
 	}
 
-	static void method205(CacheIndex var0, CacheIndex var2, Interface4 var3) {
-		try {
-			aClass153_1967 = var0;
-			Class58.anInterface4_915 = var3;
-			Class3_Sub24_Sub3.aClass153_3490 = var2;
-			if(Class3_Sub24_Sub3.aClass153_3490 != null) {
-				Class83.anInt1156 = Class3_Sub24_Sub3.aClass153_3490.getFileAmount(1);
-			}
-
-			if(aClass153_1967 != null) {
-				RenderAnimationDefinition.anInt377 = aClass153_1967.getFileAmount(1);
-			}
-		} catch (RuntimeException var5) {
-			throw ClientErrorException.clientError(var5, "ej.E(" + (var0 != null?"{...}":"null") + ',' + 115 + ',' + (var2 != null?"{...}":"null") + ',' + (var3 != null?"{...}":"null") + ')');
-		}
-	}
-
 	public TextureOperation9() {
 		super(1, false);
 	}
diff --git a/Client/src/main/java/org/runite/client/Unsorted.java b/Client/src/main/java/org/runite/client/Unsorted.java
index c44b3285a..02cc5daa7 100644
--- a/Client/src/main/java/org/runite/client/Unsorted.java
+++ b/Client/src/main/java/org/runite/client/Unsorted.java
@@ -175,6 +175,7 @@ public class Unsorted {
     public static Class158 aClass158_3009;
     static long[] aLongArray3271 = new long[500];
     static boolean aBoolean3275 = true;
+    static int anInt154 = 0;
 
     static void method2086() {
         try {
@@ -1038,7 +1039,7 @@ public class Unsorted {
             Class132.anInt1741 = 0;
             TextureOperation8.anInt3463 = var1;
             aBoolean2311 = false;
-            Class10.anInt154 = 1;
+            anInt154 = 1;
             GraphicDefinition.anInt546 = 2;
 
             TextureOperation36.anInt3423 = var5;
@@ -1752,7 +1753,7 @@ public class Unsorted {
         try {
             TextureOperation36.anInt3423 = 0;
             Class132.anInt1741 = -1;
-            Class10.anInt154 = 1;
+            anInt154 = 1;
             GraphicDefinition.anInt546 = 2;
             aBoolean2311 = false;
             Class101.aClass153_1423 = null;
@@ -3239,7 +3240,7 @@ public class Unsorted {
 
                     if (var2 == 1 && var4.anObjectArray176 != null) {
                         if (var4.anInt191 >= 0) {
-                            RSInterface var8 = Class7.getRSInterface(var4.componentHash);
+                            RSInterface var8 = getRSInterface(var4.componentHash);
                             if (null == var8 || null == var8.aClass11Array262 || var8.aClass11Array262.length <= var4.anInt191 || var8.aClass11Array262[var4.anInt191] != var4) {
                                 continue;
                             }
@@ -5225,4 +5226,63 @@ public class Unsorted {
             return true;
         }
     }
+
+    public static RSInterface getRSInterface(int interfaceHash) {
+        try {
+            int windowId = interfaceHash >> 16;
+
+            int componentId = 65535 & interfaceHash;
+            if (GameObject.aClass11ArrayArray1834.length <= windowId || windowId < 0) {
+                return null;
+            }
+            if (GameObject.aClass11ArrayArray1834[windowId] == null || GameObject.aClass11ArrayArray1834[windowId].length <= componentId || null == GameObject.aClass11ArrayArray1834[windowId][componentId]) {
+                boolean var4 = loadInterface(windowId);
+                if (!var4) {
+                    return null;
+                }
+            }
+            if (GameObject.aClass11ArrayArray1834[windowId].length <= componentId) {
+                return null;
+            }
+            return GameObject.aClass11ArrayArray1834[windowId][componentId];
+        } catch (RuntimeException var5) {
+            throw ClientErrorException.clientError(var5, "af.F(" + interfaceHash + ')');
+        }
+    }
+
+    static void method551(int var1, int var2) {
+       try {
+          if(4 == var2 && !Class128.aBoolean1685) {
+             var2 = 2;
+             var1 = 2;
+          }
+
+          if(var2 == Class23.anInt453) {
+             if(0 != var2 && var1 != TextureOperation37.anInt3263) {
+                anShaderInterfaceArray70[var2].method23(var1);
+                TextureOperation37.anInt3263 = var1;
+             }
+          } else {
+             if(TextureOperation23.aBoolean3207) {
+                return;
+             }
+
+             if(Class23.anInt453 != 0) {
+                anShaderInterfaceArray70[Class23.anInt453].method21();
+             }
+
+             if(var2 != 0) {
+                ShaderInterface var3 = anShaderInterfaceArray70[var2];
+                var3.method22();
+                var3.method23(var1);
+             }
+
+             Class23.anInt453 = var2;
+             TextureOperation37.anInt3263 = var1;
+          }
+
+       } catch (RuntimeException var4) {
+          throw ClientErrorException.clientError(var4, "cb.A(" + 0 + ',' + var1 + ',' + var2 + ')');
+       }
+    }
 }
diff --git a/Client/src/main/java/org/runite/client/WaterfallShader.java b/Client/src/main/java/org/runite/client/WaterfallShader.java
index fea3a2ebc..02f7ca551 100644
--- a/Client/src/main/java/org/runite/client/WaterfallShader.java
+++ b/Client/src/main/java/org/runite/client/WaterfallShader.java
@@ -20,7 +20,7 @@ final class WaterfallShader implements ShaderInterface {
 
    static void method1626(byte var0) {
       try {
-         Class3_Sub28_Sub4.aReferenceCache_3572.clear();
+         QuickChatDefinition.aReferenceCache_3572.clear();
          Class143.aReferenceCache_1874.clear();
          if(var0 <= -124) {
             Class67.aReferenceCache_1013.clear();
diff --git a/Client/src/main/kotlin/org/rs09/client/console/DeveloperConsole.kt b/Client/src/main/kotlin/org/rs09/client/console/DeveloperConsole.kt
index 74a465d95..1122b320d 100644
--- a/Client/src/main/kotlin/org/rs09/client/console/DeveloperConsole.kt
+++ b/Client/src/main/kotlin/org/rs09/client/console/DeveloperConsole.kt
@@ -214,7 +214,7 @@ object DeveloperConsole {
                 for (i in 0..17) {
                     val component = (lookup.values!![i.toLong()]!! as LinkableInt).value
 
-                    val rsiface = Class7.getRSInterface(component)
+                    val rsiface = Unsorted.getRSInterface(component)
                     if (rsiface == null) println("Error: couldnt find component for hash $component")
 
                     println("$i: <col=5555ff>${rsiface.text}</col>")
@@ -228,7 +228,7 @@ object DeveloperConsole {
                 for (i in 0..130) {
                     val component = (lookup.values!![i.toLong()]!! as LinkableInt).value
 
-                    val rsiface = Class7.getRSInterface(component)
+                    val rsiface = Unsorted.getRSInterface(component)
                     if (rsiface == null) println("Error: couldnt find component for hash $component")
 
                     println("$i: <col=5555ff>${rsiface.text}</col>")