diff --git a/.run/javasteam [wrapper --gradle-version 8.12].run.xml b/.run/javasteam [wrapper --gradle-version 8.14].run.xml
similarity index 90%
rename from .run/javasteam [wrapper --gradle-version 8.12].run.xml
rename to .run/javasteam [wrapper --gradle-version 8.14].run.xml
index 11afda7f..b23e505b 100644
--- a/.run/javasteam [wrapper --gradle-version 8.12].run.xml	
+++ b/.run/javasteam [wrapper --gradle-version 8.14].run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="javasteam [wrapper --gradle-version 8.12]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+  <configuration default="false" name="javasteam [wrapper --gradle-version 8.14]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -12,7 +12,7 @@
         <list>
           <option value="wrapper" />
           <option value="--gradle-version" />
-          <option value="8.12" />
+          <option value="8.14" />
         </list>
       </option>
       <option name="vmOptions" />
diff --git a/build.gradle.kts b/build.gradle.kts
index b11ed834..f8202d81 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -114,21 +114,26 @@ tasks.jar {
     }
 }
 
-/* Dependencies */
-tasks["lintKotlinMain"].dependsOn("formatKotlin")
+/* Tasks */
 tasks["check"].dependsOn("jacocoTestReport")
 tasks["compileJava"].dependsOn("generateSteamLanguage", "generateProjectVersion", "generateRpcMethods")
 tasks["compileKotlin"].dependsOn("generateSteamLanguage", "generateProjectVersion", "generateRpcMethods")
 tasks["generateRpcMethods"].dependsOn("extractProto", "extractIncludeProto")
-
-// tasks["build"].finalizedBy("dokkaGenerate")
+afterEvaluate {
+    tasks.named("lintKotlin") {
+        dependsOn("formatKotlin")
+    }
+}
 
 /* Kotlinter */
 tasks.withType<LintTask> {
-    this.source = this.source.minus(fileTree("build/generated")).asFileTree
+    val generatedFile = "${File.separator}build${File.separator}generated"
+    exclude { it.file.path.contains(generatedFile) }
 }
+
 tasks.withType<FormatTask> {
-    this.source = this.source.minus(fileTree("build/generated")).asFileTree
+    val generatedFile = "${File.separator}build${File.separator}generated"
+    exclude { it.file.path.contains(generatedFile) }
 }
 
 /* JDK and Mockito self attachment fix */
diff --git a/buildSrc/src/main/kotlin/in/dragonbra/generators/steamlanguage/generator/JavaGen.kt b/buildSrc/src/main/kotlin/in/dragonbra/generators/steamlanguage/generator/JavaGen.kt
index 28b45981..17a36ac6 100644
--- a/buildSrc/src/main/kotlin/in/dragonbra/generators/steamlanguage/generator/JavaGen.kt
+++ b/buildSrc/src/main/kotlin/in/dragonbra/generators/steamlanguage/generator/JavaGen.kt
@@ -76,14 +76,14 @@ class JavaGen(
 
             if ((node as ClassNode).ident != null) {
                 if (node.name.contains("MsgGC")) {
-                    imports.add("in.dragonbra.javasteam.base.IGCSerializableMessage")
+                    imports.add("in.dragonbra.javasteam.base.gc.IGCSerializableMessage")
                 } else {
                     imports.add("in.dragonbra.javasteam.base.ISteamSerializableMessage")
                     imports.add("in.dragonbra.javasteam.enums.EMsg")
                 }
             } else if (node.name.contains("Hdr")) {
                 if (node.name.contains("MsgGC")) {
-                    imports.add("in.dragonbra.javasteam.base.IGCSerializableHeader")
+                    imports.add("in.dragonbra.javasteam.base.gc.IGCSerializableHeader")
                 } else {
                     imports.add("in.dragonbra.javasteam.base.ISteamSerializableHeader")
                 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d42f0aef..a878e273 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,32 +5,32 @@
 
 [versions]
 java = "11"
-kotlin = "2.2.0" # https://kotlinlang.org/docs/releases.html#release-details
+kotlin = "2.2.21" # https://kotlinlang.org/docs/releases.html#release-details
 dokka = "2.0.0" # https://mvnrepository.com/artifact/org.jetbrains.dokka/dokka-gradle-plugin
-kotlinter = "5.1.1" # https://plugins.gradle.org/plugin/org.jmailen.kotlinter
-jacoco = "0.8.13" # https://www.eclemma.org/jacoco
+kotlinter = "5.3.0" # https://plugins.gradle.org/plugin/org.jmailen.kotlinter
+jacoco = "0.8.14" # https://www.eclemma.org/jacoco
 
 # Standard Library versions
-commons-lang3 = "3.18.0" # https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
+commons-lang3 = "3.20.0" # https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
 kotlin-coroutines = "1.10.2" # https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core
-ktor = "3.2.2" # https://mvnrepository.com/artifact/io.ktor/ktor-client-cio
-okHttp = "5.1.0" # https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
+ktor = "3.3.3" # https://mvnrepository.com/artifact/io.ktor/ktor-client-cio
+okHttp = "5.3.2" # https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
 protobuf = "4.31.1" # https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java
 protobuf-gradle = "0.9.5" # https://mvnrepository.com/artifact/com.google.protobuf/protobuf-gradle-plugin
 publishPlugin = "2.0.0" # https://mvnrepository.com/artifact/io.github.gradle-nexus/publish-plugin
-xz = "1.10" # https://mvnrepository.com/artifact/org.tukaani/xz
-zstd = "1.5.7-4" # https://search.maven.org/artifact/com.github.luben/zstd-jni
+xz = "1.11" # https://mvnrepository.com/artifact/org.tukaani/xz
+zstd = "1.5.7-6" # https://search.maven.org/artifact/com.github.luben/zstd-jni
 
 # Testing Lib versions
-commons-io = "2.20.0" # https://mvnrepository.com/artifact/commons-io/commons-io
-commonsCodec = "1.19.0" # https://mvnrepository.com/artifact/commons-codec/commons-codec
+commons-io = "2.21.0" # https://mvnrepository.com/artifact/commons-io/commons-io
+commonsCodec = "1.20.0" # https://mvnrepository.com/artifact/commons-codec/commons-codec
 junit5 = "5.13.4" # https://mvnrepository.com/artifact/org.junit/junit-bom
 mockWebServer = "5.1.0" # https://mvnrepository.com/artifact/com.squareup.okhttp3/mockwebserver3-junit5
 mockitoVersion = "5.18.0" # https://mvnrepository.com/artifact/org.mockito/mockito-core
 
 # Samples
-bouncyCastle = "1.81" # https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk18on
-gson = "2.13.1" # https://mvnrepository.com/artifact/com.google.code.gson/gson
+bouncyCastle = "1.83" # https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk18on
+gson = "2.13.2" # https://mvnrepository.com/artifact/com.google.code.gson/gson
 qrCode = "1.0.1" # https://mvnrepository.com/artifact/pro.leaco.qrcode/console-qrcode
 
 [libraries]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cea7a793..ca025c83 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6d..f3b75f3b 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/javasteam-samples/src/main/java/in/dragonbra/javasteamsamples/_030_counterstrikegc/SampleCounterStrikeGC.java b/javasteam-samples/src/main/java/in/dragonbra/javasteamsamples/_030_counterstrikegc/SampleCounterStrikeGC.java
index 5ac40cb1..54ccc5c3 100644
--- a/javasteam-samples/src/main/java/in/dragonbra/javasteamsamples/_030_counterstrikegc/SampleCounterStrikeGC.java
+++ b/javasteam-samples/src/main/java/in/dragonbra/javasteamsamples/_030_counterstrikegc/SampleCounterStrikeGC.java
@@ -1,6 +1,6 @@
 package in.dragonbra.javasteamsamples._030_counterstrikegc;
 
-import in.dragonbra.javasteam.base.ClientGCMsgProtobuf;
+import in.dragonbra.javasteam.base.gc.ClientGCMsgProtobuf;
 import in.dragonbra.javasteam.base.ClientMsgProtobuf;
 import in.dragonbra.javasteam.enums.EAccountType;
 import in.dragonbra.javasteam.enums.EMsg;
diff --git a/src/main/java/in/dragonbra/javasteam/base/AClientMsgProtobuf.java b/src/main/java/in/dragonbra/javasteam/base/AClientMsgProtobuf.java
deleted file mode 100644
index 9cf27b34..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/AClientMsgProtobuf.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import in.dragonbra.javasteam.enums.EMsg;
-import in.dragonbra.javasteam.generated.MsgHdrProtoBuf;
-import in.dragonbra.javasteam.protobufs.steamclient.SteammessagesBase.CMsgProtoBufHeader;
-import in.dragonbra.javasteam.types.JobID;
-import in.dragonbra.javasteam.types.SteamID;
-import in.dragonbra.javasteam.util.log.LogManager;
-import in.dragonbra.javasteam.util.log.Logger;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-/**
- * Represents a protobuf backed client message. Only contains the header information.
- */
-@SuppressWarnings("unused")
-public class AClientMsgProtobuf extends MsgBase<MsgHdrProtoBuf> {
-
-    private static final Logger logger = LogManager.getLogger(AClientMsgProtobuf.class);
-
-    /**
-     * Initializes a new instance of the{@link AClientMsgProtobuf} class.
-     * This is a recieve constructor.
-     *
-     * @param msg The packet message to build this client message from.
-     */
-    public AClientMsgProtobuf(IPacketMsg msg) {
-        this(msg.getMsgType());
-
-        if (!msg.isProto()) {
-            logger.debug("ClientMsgProtobuf used for non-proto message!");
-        }
-
-        deserialize(msg.getData());
-    }
-
-    private AClientMsgProtobuf() {
-        this(0);
-    }
-
-    AClientMsgProtobuf(int payloadReserve) {
-        super(MsgHdrProtoBuf.class, payloadReserve);
-    }
-
-    private AClientMsgProtobuf(EMsg eMsg) {
-        this(eMsg, 0);
-    }
-
-    private AClientMsgProtobuf(EMsg eMsg, int payloadReserve) {
-        super(MsgHdrProtoBuf.class, payloadReserve);
-        // set our emsg
-        getHeader().setEMsg(eMsg);
-    }
-
-    public CMsgProtoBufHeader.Builder getProtoHeader() {
-        return getHeader().getProto();
-    }
-
-    @Override
-    public boolean isProto() {
-        return true;
-    }
-
-    @Override
-    public EMsg getMsgType() {
-        return getHeader().getMsg();
-    }
-
-    @Override
-    public int getSessionID() {
-        return getProtoHeader().getClientSessionid();
-    }
-
-    @Override
-    public void setSessionID(int sessionID) {
-        getProtoHeader().setClientSessionid(sessionID);
-    }
-
-    @Override
-    public SteamID getSteamID() {
-        return new SteamID(getProtoHeader().getSteamid());
-    }
-
-    @Override
-    public void setSteamID(SteamID steamID) {
-        if (steamID == null) {
-            throw new IllegalArgumentException("steamID is null");
-        }
-        getProtoHeader().setSteamid(steamID.convertToUInt64());
-    }
-
-    @Override
-    public JobID getTargetJobID() {
-        return new JobID(getProtoHeader().getJobidTarget());
-    }
-
-    @Override
-    public void setTargetJobID(JobID jobID) {
-        if (jobID == null) {
-            throw new IllegalArgumentException("jobID is null");
-        }
-        getProtoHeader().setJobidTarget(jobID.getValue());
-    }
-
-    @Override
-    public JobID getSourceJobID() {
-        return new JobID(getProtoHeader().getJobidSource());
-    }
-
-    @Override
-    public void setSourceJobID(JobID jobID) {
-        if (jobID == null) {
-            throw new IllegalArgumentException("jobID is null");
-        }
-        getProtoHeader().setJobidSource(jobID.getValue());
-    }
-
-    @Override
-    public byte[] serialize() {
-        throw new UnsupportedOperationException("ClientMsgProtobuf is for reading only. Use ClientMsgProtobuf<T> for serializing messages.");
-    }
-
-    @Override
-    public void deserialize(byte[] data) {
-        try(var bais = new ByteArrayInputStream(data)) {
-            getHeader().deserialize(bais);
-        } catch (IOException e) {
-            logger.debug(e);
-        }
-    }
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/AClientMsgProtobuf.kt b/src/main/java/in/dragonbra/javasteam/base/AClientMsgProtobuf.kt
new file mode 100644
index 00000000..d797d1eb
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/AClientMsgProtobuf.kt
@@ -0,0 +1,121 @@
+package `in`.dragonbra.javasteam.base
+
+import `in`.dragonbra.javasteam.enums.EMsg
+import `in`.dragonbra.javasteam.generated.MsgHdrProtoBuf
+import `in`.dragonbra.javasteam.protobufs.steamclient.SteammessagesBase
+import `in`.dragonbra.javasteam.types.JobID
+import `in`.dragonbra.javasteam.types.SteamID
+import `in`.dragonbra.javasteam.util.log.LogManager
+import `in`.dragonbra.javasteam.util.log.Logger
+import `in`.dragonbra.javasteam.util.stream.MemoryStream
+import java.io.IOException
+
+/**
+ * Represents a protobuf backed client message. Only contains the header information.
+ */
+@Suppress("unused")
+open class AClientMsgProtobuf : MsgBase<MsgHdrProtoBuf> {
+
+    companion object {
+        private val logger: Logger = LogManager.getLogger(AClientMsgProtobuf::class.java)
+    }
+
+    /**
+     * Shorthand accessor for the protobuf header.
+     */
+    val protoHeader: SteammessagesBase.CMsgProtoBufHeader.Builder
+        get() = header.proto
+
+    /**
+     * Gets a value indicating whether this client message is protobuf backed.
+     * Client messages of this type are always protobuf backed.
+     * @return **true** if this instance is protobuf backed; otherwise, **false**.
+     */
+    override val isProto: Boolean
+        get() = true
+
+    /**
+     * Gets the network message type of this client message.
+     * @return The network message type.
+     */
+    override val msgType: EMsg
+        get() = header.msg
+
+    /**
+     * Gets or Sets the session id for this client message.
+     */
+    override var sessionID: Int
+        get() = protoHeader.clientSessionid
+        set(value) {
+            protoHeader.clientSessionid = value
+        }
+
+    /**
+     * Gets or Sets the [SteamID] for this client message.
+     */
+    override var steamID: SteamID?
+        get() = SteamID(protoHeader.steamid)
+        set(value) {
+            protoHeader.steamid = value!!.convertToUInt64()
+        }
+
+    /**
+     * Gets or Sets the target job id for this client message.
+     */
+    override var targetJobID: JobID
+        get() = JobID(protoHeader.jobidTarget)
+        set(value) {
+            protoHeader.jobidTarget = value.value
+        }
+
+    /**
+     * Gets or Sets the source job id for this client message.
+     */
+    override var sourceJobID: JobID
+        get() = JobID(protoHeader.jobidSource)
+        set(value) {
+            protoHeader.jobidSource = value.value
+        }
+
+    /**
+     * Initializes a new instance of the [AClientMsgProtobuf] class.
+     * This is a recieve constructor.
+     * @param msg The packet message to build this client message from.
+     */
+    constructor(msg: IPacketMsg) : this(msg.msgType) {
+        if (!msg.isProto) {
+            logger.error("ClientMsgProtobuf used for non-proto message!")
+        }
+
+        deserialize(msg.data)
+    }
+
+    private constructor() : this(0)
+
+    internal constructor(payloadReserve: Int) : super(MsgHdrProtoBuf::class.java, payloadReserve)
+
+    private constructor(eMsg: EMsg, payloadReserve: Int = 0) : super(MsgHdrProtoBuf::class.java, payloadReserve) {
+        // set our emsg
+        header.setEMsg(eMsg)
+    }
+
+    /**
+     * Serializes this client message instance to a byte array.
+     * @throws UnsupportedOperationException This class is for reading Protobuf messages only. If you want to create a protobuf message, use [ClientMsgProtobuf].
+     */
+    override fun serialize(): ByteArray = throw UnsupportedOperationException("ClientMsgProtobuf is for reading only. Use ClientMsgProtobuf<T> for serializing messages.")
+
+    /**
+     * Initializes this client message by deserializing the specified data.
+     * @param data The data representing a client message.
+     */
+    override fun deserialize(data: ByteArray) {
+        try {
+            MemoryStream(data).use { ms ->
+                header.deserialize(ms)
+            }
+        } catch (e: IOException) {
+            logger.error(e)
+        }
+    }
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/AbstractMsgBase.java b/src/main/java/in/dragonbra/javasteam/base/AbstractMsgBase.java
deleted file mode 100644
index 69a8c957..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/AbstractMsgBase.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import in.dragonbra.javasteam.util.stream.BinaryReader;
-import in.dragonbra.javasteam.util.stream.BinaryWriter;
-import in.dragonbra.javasteam.util.stream.MemoryStream;
-import in.dragonbra.javasteam.util.stream.SeekOrigin;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-
-/**
- * This class provides a payload backing to client messages.
- */
-@SuppressWarnings("unused")
-public abstract class AbstractMsgBase {
-
-    protected MemoryStream payload;
-
-    private final BinaryReader reader;
-
-    private final BinaryWriter writer;
-
-    /**
-     * Initializes a new instance of the {@link AbstractMsgBase} class.
-     */
-    public AbstractMsgBase() {
-        this(0);
-    }
-
-    /**
-     * Initializes a new instance of the {@link AbstractMsgBase} class.
-     *
-     * @param payloadReserve The number of bytes to initialize the payload capacity to.
-     */
-    public AbstractMsgBase(int payloadReserve) {
-        payload = new MemoryStream(payloadReserve);
-
-        reader = new BinaryReader(payload);
-        writer = new BinaryWriter(payload.asOutputStream());
-    }
-
-    /**
-     * Seeks within the payload to the specified offset.
-     *
-     * @param offset     The offset in the payload to seek to.
-     * @param seekOrigin The origin to seek from.
-     * @return The new position within the stream, calculated by combining the initial reference point and the offset.
-     */
-    public long seek(long offset, SeekOrigin seekOrigin) {
-        return payload.seek(offset, seekOrigin);
-    }
-
-    public void writeByte(byte data) throws IOException {
-        writer.write(data);
-    }
-
-    public byte readByte() throws IOException {
-        return reader.readByte();
-    }
-
-    public void writeBytes(byte[] data) throws IOException {
-        writer.write(data);
-    }
-
-    public byte[] readBytes(int numBytes) throws IOException {
-        return reader.readBytes(numBytes);
-    }
-
-    public void writeShort(short data) throws IOException {
-        writer.writeShort(data);
-    }
-
-    public short readShort() throws IOException {
-        return reader.readShort();
-    }
-
-    public void writeInt(int data) throws IOException {
-        writer.writeInt(data);
-    }
-
-    public int readInt() throws IOException {
-        return reader.readInt();
-    }
-
-    public void writeLong(long data) throws IOException {
-        writer.writeLong(data);
-    }
-
-    public long readLong() throws IOException {
-        return reader.readLong();
-    }
-
-    public void writeFloat(float data) throws IOException {
-        writer.writeFloat(data);
-    }
-
-    public float readFloat() throws IOException {
-        return reader.readFloat();
-    }
-
-    public void writeDouble(double data) throws IOException {
-        writer.writeDouble(data);
-    }
-
-    public double readDouble() throws IOException {
-        return reader.readDouble();
-    }
-
-    public void writeString(String data) throws IOException {
-        writeString(data, StandardCharsets.UTF_8);
-    }
-
-    public void writeString(String data, Charset charset) throws IOException {
-        if (data == null) {
-            return;
-        }
-
-        if (charset == null) {
-            throw new IllegalArgumentException("charset is null");
-        }
-
-        writeBytes(data.getBytes(charset));
-    }
-
-    public void writeNullTermString(String data) throws IOException {
-        writeNullTermString(data, StandardCharsets.UTF_8);
-    }
-
-    public void writeNullTermString(String data, Charset charset) throws IOException {
-        writeString(data, charset);
-        writeString("\0", charset);
-    }
-
-    public String readNullTermString() throws IOException {
-        return readNullTermString(StandardCharsets.UTF_8);
-    }
-
-    public String readNullTermString(Charset charset) throws IOException {
-        return reader.readNullTermString(charset);
-    }
-
-    public MemoryStream getPayload() {
-        return payload;
-    }
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/AbstractMsgBase.kt b/src/main/java/in/dragonbra/javasteam/base/AbstractMsgBase.kt
new file mode 100644
index 00000000..82b21868
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/AbstractMsgBase.kt
@@ -0,0 +1,190 @@
+package `in`.dragonbra.javasteam.base
+
+import `in`.dragonbra.javasteam.util.stream.BinaryReader
+import `in`.dragonbra.javasteam.util.stream.BinaryWriter
+import `in`.dragonbra.javasteam.util.stream.MemoryStream
+import `in`.dragonbra.javasteam.util.stream.SeekOrigin
+import java.io.IOException
+import java.nio.charset.Charset
+import java.nio.charset.StandardCharsets
+
+/**
+ * This class provides a payload backing to client messages.
+ * @constructor Initializes a new instance of the [AbstractMsgBase] class.
+ * @param payloadReserve The number of bytes to initialize the payload capacity to.
+ */
+@Suppress("unused")
+abstract class AbstractMsgBase @JvmOverloads constructor(payloadReserve: Int = 0) {
+
+    /**
+     * Returns a [MemoryStream]which is the backing stream for client message payload data.
+     */
+    val payload: MemoryStream = MemoryStream(payloadReserve)
+
+    private val reader: BinaryReader = BinaryReader(payload)
+
+    private val writer: BinaryWriter = BinaryWriter(payload.asOutputStream())
+
+    /**
+     * Seeks within the payload to the specified offset.
+     * @param offset     The offset in the payload to seek to.
+     * @param seekOrigin The origin to seek from.
+     * @return The new position within the stream, calculated by combining the initial reference point and the offset.
+     */
+    fun seek(offset: Long, seekOrigin: SeekOrigin): Long = payload.seek(offset, seekOrigin)
+
+    /* Writers */
+
+    /**
+     * Writes a single [Byte] to the message payload.
+     * @param data the byte.
+     */
+    @Throws(IOException::class)
+    fun writeByte(data: Byte) {
+        writer.write(data.toInt())
+    }
+
+    /**
+     * Writes the specified [ByteArray] to the message payload.
+     * @param data the byte array.
+     */
+    @Throws(IOException::class)
+    fun writeBytes(data: ByteArray) {
+        writer.write(data)
+    }
+
+    /**
+     * Writes a single [Short] to the message payload.
+     * @param data the short.
+     */
+    @Throws(IOException::class)
+    fun writeShort(data: Short) {
+        writer.writeShort(data)
+    }
+
+    /**
+     * Writes a single [Int] to the message payload.
+     * @param data the integer.
+     */
+    @Throws(IOException::class)
+    fun writeInt(data: Int) {
+        writer.writeInt(data)
+    }
+
+    /**
+     * Writes a single [Long] to the message payload.
+     * @param data the long.
+     */
+    @Throws(IOException::class)
+    fun writeLong(data: Long) {
+        writer.writeLong(data)
+    }
+
+    /**
+     * Writes a single [Float] to the message payload.
+     * @param data the float.
+     */
+    @Throws(IOException::class)
+    fun writeFloat(data: Float) {
+        writer.writeFloat(data)
+    }
+
+    /**
+     * Writes a single [Double] to the message payload.
+     * @param data the double.
+     */
+    @Throws(IOException::class)
+    fun writeDouble(data: Double) {
+        writer.writeDouble(data)
+    }
+
+    /**
+     * Writes the specified string to the message payload using UTF-8 encoding.
+     * This function does not write a terminating null character.
+     * @param data The string to write.
+     * @param charset The encoding to use.
+     */
+    @JvmOverloads
+    @Throws(IOException::class)
+    fun writeString(data: String?, charset: Charset = StandardCharsets.UTF_8) {
+        if (data == null) {
+            return
+        }
+
+        writeBytes(data.toByteArray(charset))
+    }
+
+    /**
+     * Writes the specified string and a null terminator to the message payload using UTF-8 encoding.
+     * Default encoding is UTF-8
+     * @param data The string to write.
+     * @param charset The encoding to use.
+     */
+    @JvmOverloads
+    @Throws(IOException::class)
+    fun writeNullTermString(data: String?, charset: Charset = StandardCharsets.UTF_8) {
+        writeString(data, charset)
+        writeString("\u0000", charset)
+    }
+
+    /* Readers */
+
+    /**
+     * Reads a single [Byte] from the message payload.
+     * @return The byte.
+     */
+    @Throws(IOException::class)
+    fun readByte(): Byte = reader.readByte()
+
+    /**
+     * Reads a number of bytes from the message payload.
+     * @param numBytes The number of bytes to read.
+     * @return The data.
+     */
+    @Throws(IOException::class)
+    fun readBytes(numBytes: Int): ByteArray = reader.readBytes(numBytes)
+
+    /**
+     * Reads a single [Short] from the message payload.
+     * @return The short.
+     */
+    @Throws(IOException::class)
+    fun readShort(): Short = reader.readShort()
+
+    /**
+     * Reads a single [Int] from the message payload.
+     * @return The integer.
+     */
+    @Throws(IOException::class)
+    fun readInt(): Int = reader.readInt()
+
+    /**
+     * Reads a single [Long] from the message payload.
+     * @return The long.
+     */
+    @Throws(IOException::class)
+    fun readLong(): Long = reader.readLong()
+
+    /**
+     * Reads a single [Float] from the message payload.
+     * @return The float.
+     */
+    @Throws(IOException::class)
+    fun readFloat(): Float = reader.readFloat()
+
+    /**
+     * Reads a single [Double] from the message payload.
+     * @return The double.
+     */
+    @Throws(IOException::class)
+    fun readDouble(): Double = reader.readDouble()
+
+    /**
+     * Reads a null terminated string from the message payload with the specified encoding.
+     * Default encoding is UTF-8
+     * @param charset The encoding to use.
+     */
+    @JvmOverloads
+    @Throws(IOException::class)
+    fun readNullTermString(charset: Charset = StandardCharsets.UTF_8): String = reader.readNullTermString(charset)
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/ClientGCMsg.java b/src/main/java/in/dragonbra/javasteam/base/ClientGCMsg.java
deleted file mode 100644
index dddb63c3..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/ClientGCMsg.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import in.dragonbra.javasteam.generated.MsgGCHdr;
-import in.dragonbra.javasteam.types.JobID;
-import in.dragonbra.javasteam.util.log.LogManager;
-import in.dragonbra.javasteam.util.log.Logger;
-import in.dragonbra.javasteam.util.stream.MemoryStream;
-import in.dragonbra.javasteam.util.stream.SeekOrigin;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * Represents a struct backed game coordinator message.
- *
- * @param <BodyType> The body type of this message.
- */
-@SuppressWarnings("unused")
-public class ClientGCMsg<BodyType extends IGCSerializableMessage> extends GCMsgBase<MsgGCHdr> {
-
-    private static final Logger logger = LogManager.getLogger(ClientGCMsg.class);
-
-    private final int msgType;
-
-    private BodyType body;
-
-    /**
-     * Initializes a new instance of the {@link ClientGCMsg} class.
-     *
-     * @param bodyType body type
-     */
-    public ClientGCMsg(Class<? extends BodyType> bodyType) {
-        this(bodyType, 64);
-    }
-
-    /**
-     * Initializes a new instance of the {@link ClientGCMsg} class.
-     *
-     * @param bodyType       body type
-     * @param payloadReserve The number of bytes to initialize the payload capacity to.
-     */
-    public ClientGCMsg(Class<? extends BodyType> bodyType, int payloadReserve) {
-        super(MsgGCHdr.class, payloadReserve);
-
-        try {
-            body = bodyType.getDeclaredConstructor().newInstance();
-        } catch (NoSuchMethodException |
-                 InstantiationException |
-                 IllegalAccessException |
-                 InvocationTargetException e) {
-            logger.debug(e);
-        }
-
-        msgType = body.getEMsg();
-    }
-
-    /**
-     * Initializes a new instance of the {@link ClientGCMsg} class.
-     * This a reply constructor.
-     *
-     * @param bodyType body type
-     * @param msg      The message that this instance is a reply for.
-     */
-    public ClientGCMsg(Class<? extends BodyType> bodyType, GCMsgBase<MsgGCHdr> msg) {
-        this(bodyType, msg, 64);
-    }
-
-    /**
-     * Initializes a new instance of the {@link ClientGCMsg} class.
-     * This a reply constructor.
-     *
-     * @param bodyType       body type
-     * @param msg            The message that this instance is a reply for.
-     * @param payloadReserve The number of bytes to initialize the payload capacity to.
-     */
-    public ClientGCMsg(Class<? extends BodyType> bodyType, GCMsgBase<MsgGCHdr> msg, int payloadReserve) {
-        this(bodyType, payloadReserve);
-
-        if (msg == null) {
-            throw new IllegalArgumentException("msg is null");
-        }
-
-        // our target is where the message came from
-        getHeader().setTargetJobID(msg.getHeader().getSourceJobID());
-    }
-
-    /**
-     * Initializes a new instance of the {@link ClientGCMsg} class.
-     * This a receive constructor.
-     *
-     * @param bodyType body type
-     * @param msg      The packet message to build this client message from.
-     */
-    public ClientGCMsg(Class<? extends BodyType> bodyType, IPacketGCMsg msg) {
-        this(bodyType);
-
-        if (msg == null) {
-            throw new IllegalArgumentException("msg is null");
-        }
-
-        if (msg.isProto()) {
-            logger.debug("ClientMsg<" + bodyType.getName() + "> used for proto message!");
-        }
-
-        deserialize(msg.getData());
-    }
-
-    @Override
-    public boolean isProto() {
-        return false;
-    }
-
-    @Override
-    public int getMsgType() {
-        return msgType;
-    }
-
-    @Override
-    public JobID getTargetJobID() {
-        return new JobID(getHeader().getTargetJobID());
-    }
-
-    @Override
-    public void setTargetJobID(JobID jobID) {
-        if (jobID == null) {
-            throw new IllegalArgumentException("jobID is null");
-        }
-        getHeader().setTargetJobID(jobID.getValue());
-    }
-
-    @Override
-    public JobID getSourceJobID() {
-        return new JobID(getHeader().getSourceJobID());
-    }
-
-    @Override
-    public void setSourceJobID(JobID jobID) {
-        if (jobID == null) {
-            throw new IllegalArgumentException("jobID is null");
-        }
-        getHeader().setSourceJobID(jobID.getValue());
-    }
-
-    @Override
-    public byte[] serialize() {
-        try (var baos = new ByteArrayOutputStream(0)) {
-            getHeader().serialize(baos);
-            body.serialize(baos);
-            baos.write(payload.toByteArray());
-
-            return baos.toByteArray();
-        } catch (IOException e) {
-            logger.debug(e);
-        }
-
-        return new byte[0];
-    }
-
-    @Override
-    public void deserialize(byte[] data) {
-        if (data == null) {
-            throw new IllegalArgumentException("data is null");
-        }
-        MemoryStream ms = new MemoryStream(data);
-
-        try {
-            getHeader().deserialize(ms);
-            body.deserialize(ms);
-        } catch (IOException e) {
-            logger.debug(e);
-        }
-
-        payload.write(data, (int) ms.getPosition(), ms.available());
-        payload.seek(0, SeekOrigin.BEGIN);
-
-        ms.close();
-    }
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/ClientGCMsgProtobuf.java b/src/main/java/in/dragonbra/javasteam/base/ClientGCMsgProtobuf.java
deleted file mode 100644
index 076809a9..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/ClientGCMsgProtobuf.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import com.google.protobuf.AbstractMessage;
-import com.google.protobuf.GeneratedMessage;
-import in.dragonbra.javasteam.generated.MsgGCHdrProtoBuf;
-import in.dragonbra.javasteam.protobufs.steamclient.SteammessagesBase.CMsgProtoBufHeader;
-import in.dragonbra.javasteam.types.JobID;
-import in.dragonbra.javasteam.util.log.LogManager;
-import in.dragonbra.javasteam.util.log.Logger;
-import in.dragonbra.javasteam.util.stream.BinaryReader;
-import in.dragonbra.javasteam.util.stream.SeekOrigin;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/**
- * Represents a protobuf backed game coordinator message.
- *
- * @param <BodyType> The body type of this message.
- */
-@SuppressWarnings("unused")
-public class ClientGCMsgProtobuf<BodyType extends GeneratedMessage.Builder<BodyType>> extends GCMsgBase<MsgGCHdrProtoBuf> {
-
-    private static final Logger logger = LogManager.getLogger(ClientGCMsgProtobuf.class);
-
-    private BodyType body;
-
-    private final Class<? extends AbstractMessage> clazz;
-
-    /**
-     * Initializes a new instance of the {@link ClientMsgProtobuf} class.
-     * This is a client send constructor.
-     *
-     * @param clazz the type of the body
-     * @param msg   The network message type this client message represents.
-     */
-    public ClientGCMsgProtobuf(Class<? extends AbstractMessage> clazz, IPacketGCMsg msg) {
-        this(clazz, msg.getMsgType());
-        if (!msg.isProto()) {
-            logger.debug("ClientMsgProtobuf<" + clazz.getSimpleName() + "> used for non-proto message!");
-        }
-        deserialize(msg.getData());
-    }
-
-    /**
-     * Initializes a new instance of the {@link ClientGCMsgProtobuf} class.
-     * This is a client send constructor.
-     *
-     * @param clazz the type of the body
-     * @param eMsg  The network message type this client message represents.
-     */
-    public ClientGCMsgProtobuf(Class<? extends AbstractMessage> clazz, int eMsg) {
-        this(clazz, eMsg, 64);
-    }
-
-    /**
-     * Initializes a new instance of the {@link ClientGCMsgProtobuf} class.
-     * This is a client send constructor.
-     *
-     * @param clazz          the type of the body
-     * @param eMsg           The network message type this client message represents.
-     * @param payloadReserve The number of bytes to initialize the payload capacity to.
-     */
-    @SuppressWarnings("unchecked")
-    public ClientGCMsgProtobuf(Class<? extends AbstractMessage> clazz, int eMsg, int payloadReserve) {
-        super(MsgGCHdrProtoBuf.class, payloadReserve);
-        this.clazz = clazz;
-
-        try {
-            final Method m = clazz.getMethod("newBuilder");
-            body = (BodyType) m.invoke(null);
-        } catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
-            logger.debug(e);
-        }
-
-        getHeader().setEMsg(eMsg);
-    }
-
-    /**
-     * Initializes a new instance of the {@link ClientGCMsgProtobuf} class.
-     * This is a reply constructor.
-     *
-     * @param clazz the type of the body
-     * @param eMsg  The network message type this client message represents.
-     * @param msg   The message that this instance is a reply for.
-     */
-    public ClientGCMsgProtobuf(Class<? extends AbstractMessage> clazz, int eMsg, GCMsgBase<MsgGCHdrProtoBuf> msg) {
-        this(clazz, eMsg, msg, 64);
-    }
-
-    /**
-     * Initializes a new instance of the {@link ClientGCMsgProtobuf} class.
-     * This is a reply constructor.
-     *
-     * @param clazz          the type of the body
-     * @param eMsg           The network message type this client message represents.
-     * @param msg            The message that this instance is a reply for.
-     * @param payloadReserve The number of bytes to initialize the payload capacity to.
-     */
-    public ClientGCMsgProtobuf(Class<? extends AbstractMessage> clazz, int eMsg, GCMsgBase<MsgGCHdrProtoBuf> msg, int payloadReserve) {
-        this(clazz, eMsg, payloadReserve);
-
-        if (msg == null) {
-            throw new IllegalArgumentException("msg is null");
-        }
-
-        // our target is where the message came from
-        getHeader().getProto().setJobidTarget(msg.getHeader().getProto().getJobidSource());
-    }
-
-    @Override
-    public boolean isProto() {
-        return true;
-    }
-
-    @Override
-    public int getMsgType() {
-        return getHeader().getMsg();
-    }
-
-    @Override
-    public JobID getTargetJobID() {
-        return new JobID(getProtoHeader().getJobidTarget());
-    }
-
-    @Override
-    public void setTargetJobID(JobID jobID) {
-        if (jobID == null) {
-            throw new IllegalArgumentException("jobID is null");
-        }
-        getProtoHeader().setJobidTarget(jobID.getValue());
-    }
-
-    @Override
-    public JobID getSourceJobID() {
-        return new JobID(getProtoHeader().getJobidSource());
-    }
-
-    @Override
-    public void setSourceJobID(JobID jobID) {
-        if (jobID == null) {
-            throw new IllegalArgumentException("jobID is null");
-        }
-        getProtoHeader().setJobidSource(jobID.getValue());
-    }
-
-    @Override
-    public byte[] serialize() {
-        try (var baos = new ByteArrayOutputStream()) {
-            getHeader().serialize(baos);
-            body.build().writeTo(baos);
-            baos.write(payload.toByteArray());
-            return baos.toByteArray();
-        } catch (IOException ignored) {
-        }
-
-        return new byte[0];
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public void deserialize(byte[] data) {
-        if (data == null) {
-            throw new IllegalArgumentException("data is null");
-        }
-
-        try (var ms = new BinaryReader(new ByteArrayInputStream(data))) {
-            getHeader().deserialize(ms);
-            final Method m = clazz.getMethod("newBuilder");
-            body = (BodyType) m.invoke(null);
-            body.mergeFrom(ms);
-            payload.write(data, ms.getPosition(), ms.available());
-            payload.seek(0, SeekOrigin.BEGIN);
-        } catch (IOException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
-            logger.debug(e);
-        }
-    }
-
-    /**
-     * Shorthand accessor for the protobuf header.
-     *
-     * @return the protobuf header
-     */
-    public CMsgProtoBufHeader.Builder getProtoHeader() {
-        return getHeader().getProto();
-    }
-
-    /**
-     * @return the body structure of this message
-     */
-    public BodyType getBody() {
-        return body;
-    }
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/ClientMsg.java b/src/main/java/in/dragonbra/javasteam/base/ClientMsg.java
deleted file mode 100644
index 520b4937..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/ClientMsg.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import in.dragonbra.javasteam.enums.EMsg;
-import in.dragonbra.javasteam.generated.ExtendedClientMsgHdr;
-import in.dragonbra.javasteam.types.JobID;
-import in.dragonbra.javasteam.types.SteamID;
-import in.dragonbra.javasteam.util.log.LogManager;
-import in.dragonbra.javasteam.util.log.Logger;
-import in.dragonbra.javasteam.util.stream.MemoryStream;
-import in.dragonbra.javasteam.util.stream.SeekOrigin;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * Represents a struct backed client message.
- *
- * @param <BodyType> The body type of this message.
- */
-@SuppressWarnings("unused")
-public class ClientMsg<BodyType extends ISteamSerializableMessage> extends MsgBase<ExtendedClientMsgHdr> {
-
-    private static final Logger logger = LogManager.getLogger(ClientMsg.class);
-
-    private BodyType body;
-
-    /**
-     * Initializes a new instance of the {@link ClientMsg} class.
-     *
-     * @param bodyType body type
-     */
-    public ClientMsg(Class<? extends BodyType> bodyType) {
-        this(bodyType, 64);
-    }
-
-    /**
-     * Initializes a new instance of the {@link ClientMsg} class.
-     *
-     * @param bodyType       body type
-     * @param payloadReserve The number of bytes to initialize the payload capacity to.
-     */
-    public ClientMsg(Class<? extends BodyType> bodyType, int payloadReserve) {
-        super(ExtendedClientMsgHdr.class, payloadReserve);
-
-        try {
-            body = bodyType.getDeclaredConstructor().newInstance();
-        } catch (NoSuchMethodException |
-                 InstantiationException |
-                 IllegalAccessException |
-                 InvocationTargetException e) {
-            logger.debug(e);
-        }
-
-        getHeader().setEMsg(body.getEMsg());
-    }
-
-    /**
-     * Initializes a new instance of the {@link ClientMsg} class.
-     * This a reply constructor.
-     *
-     * @param bodyType body type
-     * @param msg      The message that this instance is a reply for.
-     */
-    public ClientMsg(Class<? extends BodyType> bodyType, MsgBase<ExtendedClientMsgHdr> msg) {
-        this(bodyType, msg, 64);
-    }
-
-    /**
-     * Initializes a new instance of the {@link ClientMsg} class.
-     * This a reply constructor.
-     *
-     * @param bodyType       body type
-     * @param msg            The message that this instance is a reply for.
-     * @param payloadReserve The number of bytes to initialize the payload capacity to.
-     */
-    public ClientMsg(Class<? extends BodyType> bodyType, MsgBase<ExtendedClientMsgHdr> msg, int payloadReserve) {
-        this(bodyType, payloadReserve);
-
-        if (msg == null) {
-            throw new IllegalArgumentException("msg is null");
-        }
-
-        // our target is where the message came from
-        getHeader().setTargetJobID(msg.getHeader().getSourceJobID());
-    }
-
-    /**
-     * Initializes a new instance of the {@link ClientMsg} class.
-     * This a receive constructor.
-     *
-     * @param bodyType body type
-     * @param msg      The packet message to build this client message from.
-     */
-    public ClientMsg(Class<? extends BodyType> bodyType, IPacketMsg msg) {
-        this(bodyType);
-
-        if (msg == null) {
-            throw new IllegalArgumentException("msg is null");
-        }
-
-        if (msg.isProto()) {
-            logger.debug("ClientMsg<" + bodyType.getName() + "> used for proto message!");
-        }
-
-        deserialize(msg.getData());
-    }
-
-    @Override
-    public boolean isProto() {
-        return false;
-    }
-
-    @Override
-    public EMsg getMsgType() {
-        return getHeader().getMsg();
-    }
-
-    @Override
-    public int getSessionID() {
-        return getHeader().getSessionID();
-    }
-
-    @Override
-    public void setSessionID(int sessionID) {
-        getHeader().setSessionID(sessionID);
-    }
-
-    @Override
-    public SteamID getSteamID() {
-        return getHeader().getSteamID();
-    }
-
-    @Override
-    public void setSteamID(SteamID steamID) {
-        if (steamID == null) {
-            throw new IllegalArgumentException("steamID is null");
-        }
-        getHeader().setSteamID(steamID);
-    }
-
-    @Override
-    public JobID getTargetJobID() {
-        return new JobID(getHeader().getTargetJobID());
-    }
-
-    @Override
-    public void setTargetJobID(JobID jobID) {
-        if (jobID == null) {
-            throw new IllegalArgumentException("jobID is null");
-        }
-        getHeader().setTargetJobID(jobID.getValue());
-    }
-
-    @Override
-    public JobID getSourceJobID() {
-        return new JobID(getHeader().getSourceJobID());
-    }
-
-    @Override
-    public void setSourceJobID(JobID jobID) {
-        if (jobID == null) {
-            throw new IllegalArgumentException("jobID is null");
-        }
-        getHeader().setSourceJobID(jobID.getValue());
-    }
-
-    @Override
-    public byte[] serialize() {
-        try (var baos = new ByteArrayOutputStream(0)) {
-            getHeader().serialize(baos);
-            body.serialize(baos);
-            baos.write(payload.toByteArray());
-
-            return baos.toByteArray();
-        } catch (IOException e) {
-            logger.debug(e);
-        }
-
-        return new byte[0];
-    }
-
-    @Override
-    public void deserialize(byte[] data) {
-        if (data == null) {
-            throw new IllegalArgumentException("data is null");
-        }
-        MemoryStream ms = new MemoryStream(data);
-
-        try {
-            getHeader().deserialize(ms);
-            body.deserialize(ms);
-        } catch (IOException e) {
-            logger.debug(e);
-        }
-
-        payload.write(data, (int) ms.getPosition(), ms.available());
-        payload.seek(0, SeekOrigin.BEGIN);
-
-        ms.close();
-    }
-
-    /**
-     * @return the body structure of this message.
-     */
-    public BodyType getBody() {
-        return body;
-    }
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/ClientMsg.kt b/src/main/java/in/dragonbra/javasteam/base/ClientMsg.kt
new file mode 100644
index 00000000..7ef6f69a
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/ClientMsg.kt
@@ -0,0 +1,167 @@
+package `in`.dragonbra.javasteam.base
+
+import `in`.dragonbra.javasteam.enums.EMsg
+import `in`.dragonbra.javasteam.generated.ExtendedClientMsgHdr
+import `in`.dragonbra.javasteam.types.JobID
+import `in`.dragonbra.javasteam.types.SteamID
+import `in`.dragonbra.javasteam.util.log.LogManager
+import `in`.dragonbra.javasteam.util.log.Logger
+import `in`.dragonbra.javasteam.util.stream.MemoryStream
+import `in`.dragonbra.javasteam.util.stream.SeekOrigin
+import java.io.IOException
+import java.lang.reflect.InvocationTargetException
+
+/**
+ * Represents a struct backed client message.
+ * @constructor Initializes a new instance of the [ClientMsg] class.
+ * @param bodyType The body type.
+ * @param payloadReserve The number of bytes to initialize the payload capacity to.
+ */
+@Suppress("unused")
+class ClientMsg<BodyType : ISteamSerializableMessage> @JvmOverloads constructor(
+    bodyType: Class<out BodyType>,
+    payloadReserve: Int = 64,
+) : MsgBase<ExtendedClientMsgHdr>(ExtendedClientMsgHdr::class.java, payloadReserve) {
+
+    companion object {
+        private val logger: Logger = LogManager.getLogger(ClientMsg::class.java)
+    }
+
+    /**
+     * Gets the body structure of this message.
+     */
+    lateinit var body: BodyType
+        private set
+
+    /**
+     * Gets a value indicating whether this client message is protobuf backed.
+     * @return **true** if this instance is protobuf backed; otherwise, **false**.
+     */
+    override val isProto: Boolean
+        get() = false
+
+    /**
+     * Gets the network message type of this client message.
+     * @return The network message type.
+     */
+    override val msgType: EMsg
+        get() = header.msg
+
+    /**
+     * Gets or Sets the session id for this client message.
+     */
+    override var sessionID: Int
+        get() = header.sessionID
+        set(value) {
+            header.sessionID = value
+        }
+
+    /**
+     * Gets or Sets the [SteamID] for this client message.
+     */
+    override var steamID: SteamID?
+        get() = header.steamID
+        set(value) {
+            header.steamID = requireNotNull(value)
+        }
+
+    /**
+     *  Gets or Sets the target job id for this client message.
+     */
+    override var targetJobID: JobID
+        get() = JobID(header.targetJobID)
+        set(value) {
+            header.targetJobID = value.value
+        }
+
+    /**
+     * Gets or Sets the source job id for this client message.
+     */
+    override var sourceJobID: JobID
+        get() = JobID(header.sourceJobID)
+        set(value) {
+            header.sourceJobID = value.value
+        }
+
+    /**
+     * Initializes a new instance of the [ClientMsg] class.
+     * This a reply constructor.
+     * @param bodyType       body type
+     * @param msg            The message that this instance is a reply for.
+     * @param payloadReserve The number of bytes to initialize the payload capacity to.
+     */
+    @JvmOverloads
+    constructor(bodyType: Class<out BodyType>, msg: MsgBase<ExtendedClientMsgHdr>, payloadReserve: Int = 64) :
+        this(bodyType, payloadReserve) {
+        // our target is where the message came from
+        header.targetJobID = msg.header.sourceJobID
+    }
+
+    /**
+     * Initializes a new instance of the [ClientMsg] class.
+     * This a receive constructor.
+     * @param bodyType body type
+     * @param msg      The packet message to build this client message from.
+     */
+    constructor(bodyType: Class<out BodyType>, msg: IPacketMsg) : this(bodyType) {
+        if (msg.isProto) {
+            logger.debug("ClientMsg<${bodyType.simpleName}> used for proto message!")
+        }
+
+        deserialize(msg.data)
+    }
+
+    init {
+        try {
+            body = bodyType.getDeclaredConstructor().newInstance()
+        } catch (e: NoSuchMethodException) {
+            logger.error(e)
+        } catch (e: InstantiationException) {
+            logger.error(e)
+        } catch (e: IllegalAccessException) {
+            logger.error(e)
+        } catch (e: InvocationTargetException) {
+            logger.error(e)
+        }
+
+        header.setEMsg(body.eMsg)
+    }
+
+    /**
+     * Serializes this client message instance to a byte array.
+     * @return The data representing a client message.
+     */
+    override fun serialize(): ByteArray {
+        try {
+            MemoryStream().use { ms ->
+                val os = ms.asOutputStream()
+                header.serialize(os)
+                body.serialize(os)
+                os.write(payload.toByteArray())
+                return ms.toByteArray()
+            }
+        } catch (e: IOException) {
+            logger.error(e)
+        }
+
+        return ByteArray(0)
+    }
+
+    /**
+     * Initializes this client message by deserializing the specified data.
+     * @param data The data representing a client message.
+     */
+    override fun deserialize(data: ByteArray) {
+        MemoryStream(data).use { ms ->
+            try {
+                header.deserialize(ms)
+                body.deserialize(ms)
+            } catch (e: IOException) {
+                logger.error(e)
+            }
+
+            payload.write(data, ms.position.toInt(), ms.available())
+            payload.seek(0, SeekOrigin.BEGIN)
+        }
+    }
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/ClientMsgProtobuf.java b/src/main/java/in/dragonbra/javasteam/base/ClientMsgProtobuf.java
deleted file mode 100644
index 17ca54f1..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/ClientMsgProtobuf.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import com.google.protobuf.AbstractMessage;
-import com.google.protobuf.GeneratedMessage;
-import in.dragonbra.javasteam.enums.EMsg;
-import in.dragonbra.javasteam.generated.MsgHdrProtoBuf;
-import in.dragonbra.javasteam.util.log.LogManager;
-import in.dragonbra.javasteam.util.log.Logger;
-import in.dragonbra.javasteam.util.stream.BinaryReader;
-import in.dragonbra.javasteam.util.stream.SeekOrigin;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/**
- * Represents a protobuf backed client message.
- *
- * @param <BodyType> The body type of this message.
- */
-public class ClientMsgProtobuf<BodyType extends GeneratedMessage.Builder<BodyType>> extends AClientMsgProtobuf {
-
-    private static final Logger logger = LogManager.getLogger(ClientMsgProtobuf.class);
-
-    private BodyType body;
-
-    private final Class<? extends AbstractMessage> clazz;
-
-    /**
-     * Initializes a new instance of the {@link ClientMsgProtobuf} class.
-     * This is a client send constructor.
-     *
-     * @param clazz the type of the body
-     * @param msg   The network message type this client message represents.
-     */
-    public ClientMsgProtobuf(Class<? extends AbstractMessage> clazz, IPacketMsg msg) {
-        this(clazz, msg, 64);
-        if (!msg.isProto()) {
-            logger.debug("ClientMsgProtobuf<" + clazz.getSimpleName() + "> used for non-proto message!");
-        }
-        deserialize(msg.getData());
-    }
-
-    /**
-     * Initializes a new instance of the {@link ClientMsgProtobuf} class.
-     * This is a client send constructor.
-     *
-     * @param clazz          the type of the body
-     * @param msg            The network message type this client message represents.
-     * @param payloadReserve The number of bytes to initialize the payload capacity to.
-     */
-    public ClientMsgProtobuf(Class<? extends AbstractMessage> clazz, IPacketMsg msg, int payloadReserve) {
-        this(clazz, msg.getMsgType(), payloadReserve);
-    }
-
-    /**
-     * Initializes a new instance of the {@link ClientMsgProtobuf} class.
-     * This is a client send constructor.
-     *
-     * @param clazz the type of the body
-     * @param eMsg  The network message type this client message represents.
-     */
-    public ClientMsgProtobuf(Class<? extends AbstractMessage> clazz, EMsg eMsg) {
-        this(clazz, eMsg, 64);
-    }
-
-    /**
-     * Initializes a new instance of the {@link ClientMsgProtobuf} class.
-     * This is a client send constructor.
-     *
-     * @param clazz          the type of the body
-     * @param eMsg           The network message type this client message represents.
-     * @param payloadReserve The number of bytes to initialize the payload capacity to.
-     */
-    @SuppressWarnings("unchecked")
-    public ClientMsgProtobuf(Class<? extends AbstractMessage> clazz, EMsg eMsg, int payloadReserve) {
-        super(payloadReserve);
-        this.clazz = clazz;
-
-        try {
-            final Method m = clazz.getMethod("newBuilder");
-            body = (BodyType) m.invoke(null);
-        } catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
-            logger.debug(e);
-        }
-
-        getHeader().setEMsg(eMsg);
-    }
-
-    /**
-     * Initializes a new instance of the {@link ClientMsgProtobuf} class.
-     * This is a reply constructor.
-     *
-     * @param clazz the type of the body
-     * @param eMsg  The network message type this client message represents.
-     * @param msg   The message that this instance is a reply for.
-     */
-    public ClientMsgProtobuf(Class<? extends AbstractMessage> clazz, EMsg eMsg, MsgBase<MsgHdrProtoBuf> msg) {
-        this(clazz, eMsg, msg, 64);
-    }
-
-    /**
-     * Initializes a new instance of the {@link ClientMsgProtobuf} class.
-     * This is a reply constructor.
-     *
-     * @param clazz          the type of the body
-     * @param eMsg           The network message type this client message represents.
-     * @param msg            The message that this instance is a reply for.
-     * @param payloadReserve The number of bytes to initialize the payload capacity to.
-     */
-    public ClientMsgProtobuf(Class<? extends AbstractMessage> clazz, EMsg eMsg, MsgBase<MsgHdrProtoBuf> msg, int payloadReserve) {
-        this(clazz, eMsg, payloadReserve);
-        // our target is where the message came from
-        getHeader().getProto().setJobidTarget(msg.getHeader().getProto().getJobidSource());
-    }
-
-    /**
-     * @return the body structure of this message.
-     */
-    public BodyType getBody() {
-        return body;
-    }
-
-    /**
-     * Sets the body of this message.
-     *
-     * @param _body the body structure of this message.
-     */
-    public void setBody(BodyType _body) {
-        this.body = _body;
-    }
-
-    @Override
-    public byte[] serialize() {
-        try (var baos = new ByteArrayOutputStream(0)) {
-            getHeader().serialize(baos);
-            baos.write(body.build().toByteArray());
-            baos.write(payload.toByteArray());
-
-            return baos.toByteArray();
-        } catch (IOException e) {
-            logger.debug(e);
-        }
-
-        return new byte[0];
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public void deserialize(byte[] data) {
-        if (data == null) {
-            throw new IllegalArgumentException("data is null");
-        }
-        BinaryReader ms = new BinaryReader(new ByteArrayInputStream(data));
-
-        try {
-            getHeader().deserialize(ms);
-            final Method m = clazz.getMethod("newBuilder");
-            body = (BodyType) m.invoke(null);
-            body.mergeFrom(ms);
-            payload.write(data, ms.getPosition(), ms.available());
-            payload.seek(0, SeekOrigin.BEGIN);
-        } catch (IOException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
-            logger.debug(e);
-        }
-
-        // TODO can be MemoryStream?
-        try {
-            ms.close();
-        } catch (IOException e) {
-            logger.debug(e);
-        }
-    }
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/ClientMsgProtobuf.kt b/src/main/java/in/dragonbra/javasteam/base/ClientMsgProtobuf.kt
new file mode 100644
index 00000000..142a36e3
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/ClientMsgProtobuf.kt
@@ -0,0 +1,155 @@
+package `in`.dragonbra.javasteam.base
+
+import com.google.protobuf.AbstractMessage
+import com.google.protobuf.GeneratedMessage
+import `in`.dragonbra.javasteam.enums.EMsg
+import `in`.dragonbra.javasteam.generated.MsgHdrProtoBuf
+import `in`.dragonbra.javasteam.util.log.LogManager
+import `in`.dragonbra.javasteam.util.log.Logger
+import `in`.dragonbra.javasteam.util.stream.BinaryReader
+import `in`.dragonbra.javasteam.util.stream.SeekOrigin
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
+import java.io.IOException
+import java.lang.reflect.InvocationTargetException
+
+/**
+ * Represents a protobuf backed client message.
+ * @constructor Initializes a new instance of the [ClientMsgProtobuf] class.
+ * This is a client send constructor.
+ * @param clazz The type of the body
+ * @param eMsg The network message type this client message represents.
+ * @param payloadReserve The number of bytes to initialize the payload capacity to.
+ */
+class ClientMsgProtobuf<BodyType : GeneratedMessage.Builder<BodyType>> @JvmOverloads constructor(
+    private val clazz: Class<out AbstractMessage>,
+    eMsg: EMsg,
+    payloadReserve: Int = 64,
+) : AClientMsgProtobuf(payloadReserve) {
+
+    companion object {
+        private val logger: Logger = LogManager.getLogger(ClientMsgProtobuf::class.java)
+    }
+
+    /**
+     * Gets the body structure of this message.
+     */
+    lateinit var body: BodyType
+        private set
+
+    /**
+     * Initializes a new instance of the [ClientMsgProtobuf] class.
+     * This is a client send constructor.
+     *
+     * @param clazz the type of the body
+     * @param msg   The network message type this client message represents.
+     */
+    constructor(clazz: Class<out AbstractMessage>, msg: IPacketMsg) : this(clazz, msg, 64) {
+        if (!msg.isProto) {
+            logger.debug("ClientMsgProtobuf<" + clazz.getSimpleName() + "> used for non-proto message!")
+        }
+        deserialize(msg.data)
+    }
+
+    /**
+     * Initializes a new instance of the [ClientMsgProtobuf] class.
+     * This is a client send constructor.
+     *
+     * @param clazz          the type of the body
+     * @param msg            The network message type this client message represents.
+     * @param payloadReserve The number of bytes to initialize the payload capacity to.
+     */
+    constructor(clazz: Class<out AbstractMessage>, msg: IPacketMsg, payloadReserve: Int) : this(
+        clazz,
+        msg.msgType,
+        payloadReserve
+    )
+
+    /**
+     * Initializes a new instance of the [ClientMsgProtobuf] class.
+     * This is a reply constructor.
+     *
+     * @param clazz          the type of the body
+     * @param eMsg           The network message type this client message represents.
+     * @param msg            The message that this instance is a reply for.
+     * @param payloadReserve The number of bytes to initialize the payload capacity to.
+     */
+    @JvmOverloads
+    constructor(
+        clazz: Class<out AbstractMessage>,
+        eMsg: EMsg,
+        msg: MsgBase<MsgHdrProtoBuf>,
+        payloadReserve: Int = 64,
+    ) : this(clazz, eMsg, payloadReserve) {
+        // our target is where the message came from
+        header.proto.setJobidTarget(msg.header.proto.jobidSource)
+    }
+
+    init {
+        try {
+            val m = clazz.getMethod("newBuilder")
+            @Suppress("UNCHECKED_CAST")
+            body = m.invoke(null) as BodyType
+        } catch (e: IllegalAccessException) {
+            logger.debug(e)
+        } catch (e: NoSuchMethodException) {
+            logger.debug(e)
+        } catch (e: InvocationTargetException) {
+            logger.debug(e)
+        }
+
+        header.setEMsg(eMsg)
+    }
+
+    /**
+     * Serializes this client message instance to a byte array.
+     * @return The ata representing a client message.
+     */
+    override fun serialize(): ByteArray {
+        try {
+            ByteArrayOutputStream(0).use { baos ->
+                header.serialize(baos)
+                baos.write(body.build().toByteArray())
+                baos.write(payload.toByteArray())
+                return baos.toByteArray()
+            }
+        } catch (e: IOException) {
+            logger.debug(e)
+        }
+
+        return ByteArray(0)
+    }
+
+    /**
+     * Initializes this client message by deserializing the specified data.
+     * @param data The data representing a client message.
+     */
+    override fun deserialize(data: ByteArray) {
+        val ms = BinaryReader(ByteArrayInputStream(data))
+
+        try {
+            header.deserialize(ms)
+            val m = clazz.getMethod("newBuilder")
+            @Suppress("UNCHECKED_CAST")
+            body = m.invoke(null) as BodyType
+            body.mergeFrom(ms)
+            payload.write(data, ms.position, ms.available())
+            payload.seek(0, SeekOrigin.BEGIN)
+        } catch (e: IOException) {
+            logger.debug(e)
+        } catch (e: IllegalAccessException) {
+            logger.debug(e)
+        } catch (e: NoSuchMethodException) {
+            logger.debug(e)
+        } catch (e: InvocationTargetException) {
+            logger.debug(e)
+        }
+
+        // TODO can be MemoryStream
+        try {
+            ms.close()
+        } catch (e: IOException) {
+            logger.error(e)
+        }
+    }
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/GCMsgBase.java b/src/main/java/in/dragonbra/javasteam/base/GCMsgBase.java
deleted file mode 100644
index ba956565..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/GCMsgBase.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import in.dragonbra.javasteam.util.log.LogManager;
-import in.dragonbra.javasteam.util.log.Logger;
-
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * This is the abstract base class for all available game coordinator messages.
- * It's used to maintain packet payloads and provide a header for all gc messages.
- *
- * @param <HdrType> The header type for this gc message.
- */
-@SuppressWarnings("unused")
-public abstract class GCMsgBase<HdrType extends IGCSerializableHeader> extends AbstractMsgBase implements IClientGCMsg {
-
-    private static final Logger logger = LogManager.getLogger(MsgBase.class);
-
-    private HdrType header;
-
-    /**
-     * Initializes a new instance of the {@link GCMsgBase} class.
-     *
-     * @param clazz the type of the header
-     */
-    public GCMsgBase(Class<HdrType> clazz) {
-        this(clazz, 0);
-    }
-
-    /**
-     * Initializes a new instance of the {@link GCMsgBase} class.
-     *
-     * @param clazz          the type of the header
-     * @param payloadReserve The number of bytes to initialize the payload capacity to.
-     */
-    public GCMsgBase(Class<HdrType> clazz, int payloadReserve) {
-        super(payloadReserve);
-        try {
-            header = clazz.getDeclaredConstructor().newInstance();
-        } catch (NoSuchMethodException |
-                 InstantiationException |
-                 IllegalAccessException |
-                 InvocationTargetException e) {
-            logger.debug(e);
-        }
-    }
-
-    /**
-     * @return the header for this message type.
-     */
-    public HdrType getHeader() {
-        return header;
-    }
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/IClientGCMsg.java b/src/main/java/in/dragonbra/javasteam/base/IClientGCMsg.java
deleted file mode 100644
index 855ec2e4..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/IClientGCMsg.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import in.dragonbra.javasteam.types.JobID;
-
-/**
- * Represents a unified interface into client messages.
- */
-@SuppressWarnings("unused")
-public interface IClientGCMsg {
-
-    /**
-     * Gets a value indicating whether this client message is protobuf backed.
-     *
-     * @return <b>true</b> if this instance is protobuf backed; otherwise, <b>false</b>.
-     */
-    boolean isProto();
-
-    /**
-     * Gets the network message type of this client message.
-     *
-     * @return The message type.
-     */
-    int getMsgType();
-
-    /**
-     * Gets the target job id for this client message.
-     *
-     * @return The target job id.
-     */
-    JobID getTargetJobID();
-
-    /**
-     * Sets the target job id for this client message.
-     *
-     * @param jobID The target job id.
-     */
-    void setTargetJobID(JobID jobID);
-
-    /**
-     * Gets the source job id for this client message.
-     *
-     * @return The source job id.
-     */
-    JobID getSourceJobID();
-
-    /**
-     * Sets the source job id for this client message.
-     *
-     * @param jobID The source job id.
-     */
-    void setSourceJobID(JobID jobID);
-
-    /**
-     * serializes this client message instance to a byte array.
-     *
-     * @return Data representing a client message.
-     */
-    byte[] serialize();
-
-    /**
-     * Initializes this client message by deserializing the specified data.
-     *
-     * @param data The data representing a client message.
-     */
-    void deserialize(byte[] data);
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/IClientMsg.java b/src/main/java/in/dragonbra/javasteam/base/IClientMsg.java
deleted file mode 100644
index 53e5fc38..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/IClientMsg.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import in.dragonbra.javasteam.enums.EMsg;
-import in.dragonbra.javasteam.types.JobID;
-import in.dragonbra.javasteam.types.SteamID;
-
-/**
- * Represents a unified interface into client messages.
- */
-@SuppressWarnings("unused")
-public interface IClientMsg {
-
-    /**
-     * Gets a value indicating whether this client message is protobuf backed.
-     *
-     * @return <b>true</b> if this instance is protobuf backed; otherwise, <b>false</b>.
-     */
-    boolean isProto();
-
-    /**
-     * Gets the network message type of this client message.
-     *
-     * @return The message type.
-     */
-    EMsg getMsgType();
-
-    /**
-     * Gets the session id for this client message.
-     *
-     * @return The session id.
-     */
-    int getSessionID();
-
-    /**
-     * Sets the session id for this client message.
-     *
-     * @param sessionID The session id.
-     */
-    void setSessionID(int sessionID);
-
-    /**
-     * Gets the {@link SteamID} for this client message.
-     *
-     * @return The {@link SteamID}.
-     */
-    SteamID getSteamID();
-
-    /**
-     * Sets the {@link SteamID} for this client message.
-     *
-     * @param steamID The {@link SteamID}.
-     */
-    void setSteamID(SteamID steamID);
-
-    /**
-     * Gets the target job id for this client message.
-     *
-     * @return The target job id.
-     */
-    JobID getTargetJobID();
-
-    /**
-     * Sets the target job id for this client message.
-     *
-     * @param jobID The target job id.
-     */
-    void setTargetJobID(JobID jobID);
-
-    /**
-     * Gets the source job id for this client message.
-     *
-     * @return The source job id.
-     */
-    JobID getSourceJobID();
-
-    /**
-     * Sets the source job id for this client message.
-     *
-     * @param jobID The source job id.
-     */
-    void setSourceJobID(JobID jobID);
-
-    /**
-     * serializes this client message instance to a byte array.
-     *
-     * @return Data representing a client message.
-     */
-    byte[] serialize();
-
-    /**
-     * Initializes this client message by deserializing the specified data.
-     *
-     * @param data The data representing a client message.
-     */
-    void deserialize(byte[] data);
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/IClientMsg.kt b/src/main/java/in/dragonbra/javasteam/base/IClientMsg.kt
new file mode 100644
index 00000000..92458626
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/IClientMsg.kt
@@ -0,0 +1,59 @@
+package `in`.dragonbra.javasteam.base
+
+import `in`.dragonbra.javasteam.enums.EMsg
+import `in`.dragonbra.javasteam.types.JobID
+import `in`.dragonbra.javasteam.types.SteamID
+
+/**
+ * Represents a unified interface into client messages.
+ */
+@Suppress("unused")
+interface IClientMsg {
+
+    /**
+     * Gets a value indicating whether this client message is protobuf backed.
+     * @return **true** if this instance is protobuf backed; otherwise, **false**.
+     */
+    val isProto: Boolean
+
+    /**
+     * Gets the network message type of this client message.
+     * @return The message type.
+     */
+    val msgType: EMsg
+
+    /**
+     * Gets or Sets the session id for this client message.
+     */
+    var sessionID: Int
+
+    /**
+     * Gets or Sets the [SteamID] for this client message.
+     * @return The [SteamID].
+     */
+    var steamID: SteamID?
+
+    /**
+     * Gets or Sets the target job id for this client message.
+     */
+    var targetJobID: JobID
+
+    /**
+     * Gets or Sets the source job id for this client message.
+     *
+     * @return The source job id.
+     */
+    var sourceJobID: JobID
+
+    /**
+     * serializes this client message instance to a byte array.
+     * @return Data representing a client message.
+     */
+    fun serialize(): ByteArray
+
+    /**
+     * Initializes this client message by deserializing the specified data.
+     * @param data The data representing a client message.
+     */
+    fun deserialize(data: ByteArray)
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/IGCSerializableHeader.java b/src/main/java/in/dragonbra/javasteam/base/IGCSerializableHeader.java
deleted file mode 100644
index e1fb8eb2..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/IGCSerializableHeader.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-/**
- * @author lngtr
- * @since 2018-02-21
- */
-public interface IGCSerializableHeader extends ISteamSerializable {
-    void setEMsg(int msg);
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/IGCSerializableMessage.java b/src/main/java/in/dragonbra/javasteam/base/IGCSerializableMessage.java
deleted file mode 100644
index 1b7537a3..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/IGCSerializableMessage.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-/**
- * @author lngtr
- * @since 2018-02-21
- */
-public interface IGCSerializableMessage extends ISteamSerializable {
-    int getEMsg();
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/IPacketMsg.java b/src/main/java/in/dragonbra/javasteam/base/IPacketMsg.kt
similarity index 69%
rename from src/main/java/in/dragonbra/javasteam/base/IPacketMsg.java
rename to src/main/java/in/dragonbra/javasteam/base/IPacketMsg.kt
index 459a8ff9..77f07b1d 100644
--- a/src/main/java/in/dragonbra/javasteam/base/IPacketMsg.java
+++ b/src/main/java/in/dragonbra/javasteam/base/IPacketMsg.kt
@@ -1,46 +1,42 @@
-package in.dragonbra.javasteam.base;
+package `in`.dragonbra.javasteam.base
 
-import in.dragonbra.javasteam.enums.EMsg;
+import `in`.dragonbra.javasteam.enums.EMsg
 
 /**
  * Represents a simple unified interface into client messages recieved from the network.
- * This is contrasted with {@link IClientMsg} in that this interface is packet body agnostic
+ * This is contrasted with [IClientMsg] in that this interface is packet body agnostic
  * and only allows simple access into the header. This interface is also immutable, and the underlying
  * data cannot be modified.
  */
-public interface IPacketMsg {
+interface IPacketMsg {
+
     /**
      * Gets a value indicating whether this packet message is protobuf backed.
-     *
      * @return true if this instance is protobuf backed; otherwise, false
      */
-    boolean isProto();
+    val isProto: Boolean
 
     /**
      * Gets the network message type of this packet message.
-     *
      * @return The message type.
      */
-    EMsg getMsgType();
+    val msgType: EMsg
 
     /**
      * Gets the target job id for this packet message.
-     *
      * @return The target job id.
      */
-    long getTargetJobID();
+    val targetJobID: Long
 
     /**
      * Gets the source job id for this packet message.
-     *
      * @return The source job id.
      */
-    long getSourceJobID();
+    val sourceJobID: Long
 
     /**
      * Gets the underlying data that represents this client message.
-     *
      * @return The data.
      */
-    byte[] getData();
+    val data: ByteArray
 }
diff --git a/src/main/java/in/dragonbra/javasteam/base/ISteamSerializable.java b/src/main/java/in/dragonbra/javasteam/base/ISteamSerializable.java
deleted file mode 100644
index be8d2cc4..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/ISteamSerializable.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * @author lngtr
- * @since 2018-02-21
- */
-public interface ISteamSerializable {
-
-    void serialize(OutputStream stream) throws IOException;
-
-    void deserialize(InputStream stream) throws IOException;
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/ISteamSerializable.kt b/src/main/java/in/dragonbra/javasteam/base/ISteamSerializable.kt
new file mode 100644
index 00000000..043a2278
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/ISteamSerializable.kt
@@ -0,0 +1,17 @@
+package `in`.dragonbra.javasteam.base
+
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+
+/**
+ * @author lngtr
+ * @since 2018-02-21
+ */
+interface ISteamSerializable {
+    @Throws(IOException::class)
+    fun serialize(stream: OutputStream)
+
+    @Throws(IOException::class)
+    fun deserialize(stream: InputStream)
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/ISteamSerializableHeader.java b/src/main/java/in/dragonbra/javasteam/base/ISteamSerializableHeader.java
deleted file mode 100644
index 4c6abc6b..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/ISteamSerializableHeader.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import in.dragonbra.javasteam.enums.EMsg;
-
-/**
- * @author lngtr
- * @since 2018-02-21
- */
-public interface ISteamSerializableHeader extends ISteamSerializable {
-    void setEMsg(EMsg msg);
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/ISteamSerializableHeader.kt b/src/main/java/in/dragonbra/javasteam/base/ISteamSerializableHeader.kt
new file mode 100644
index 00000000..f194322b
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/ISteamSerializableHeader.kt
@@ -0,0 +1,11 @@
+package `in`.dragonbra.javasteam.base
+
+import `in`.dragonbra.javasteam.enums.EMsg
+
+/**
+ * @author lngtr
+ * @since 2018-02-21
+ */
+interface ISteamSerializableHeader : ISteamSerializable {
+    fun setEMsg(msg: EMsg)
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/ISteamSerializableMessage.java b/src/main/java/in/dragonbra/javasteam/base/ISteamSerializableMessage.java
deleted file mode 100644
index 74e1e275..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/ISteamSerializableMessage.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import in.dragonbra.javasteam.enums.EMsg;
-
-/**
- * @author lngtr
- * @since 2018-02-21
- */
-public interface ISteamSerializableMessage extends ISteamSerializable {
-    EMsg getEMsg();
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/ISteamSerializableMessage.kt b/src/main/java/in/dragonbra/javasteam/base/ISteamSerializableMessage.kt
new file mode 100644
index 00000000..c701eaf6
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/ISteamSerializableMessage.kt
@@ -0,0 +1,11 @@
+package `in`.dragonbra.javasteam.base
+
+import `in`.dragonbra.javasteam.enums.EMsg
+
+/**
+ * @author lngtr
+ * @since 2018-02-21
+ */
+interface ISteamSerializableMessage : ISteamSerializable {
+    val eMsg: EMsg
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/Msg.java b/src/main/java/in/dragonbra/javasteam/base/Msg.java
deleted file mode 100644
index 0be7a7b7..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/Msg.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import in.dragonbra.javasteam.enums.EMsg;
-import in.dragonbra.javasteam.generated.MsgHdr;
-import in.dragonbra.javasteam.types.JobID;
-import in.dragonbra.javasteam.types.SteamID;
-import in.dragonbra.javasteam.util.log.LogManager;
-import in.dragonbra.javasteam.util.log.Logger;
-import in.dragonbra.javasteam.util.stream.MemoryStream;
-import in.dragonbra.javasteam.util.stream.SeekOrigin;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * Represents a struct backed message without session or client info.
- */
-@SuppressWarnings("unused")
-public class Msg<BodyType extends ISteamSerializableMessage> extends MsgBase<MsgHdr> {
-
-    private static final Logger logger = LogManager.getLogger(Msg.class);
-
-    private BodyType body;
-
-    /**
-     * Initializes a new instance of the {@link Msg} class.
-     *
-     * @param bodyType body type
-     */
-    public Msg(Class<? extends BodyType> bodyType) {
-        this(bodyType, 0);
-    }
-
-    /**
-     * Initializes a new instance of the {@link Msg} class.
-     *
-     * @param bodyType       body type
-     * @param payloadReserve The number of bytes to initialize the payload capacity to.
-     */
-    public Msg(Class<? extends BodyType> bodyType, int payloadReserve) {
-        super(MsgHdr.class, payloadReserve);
-
-        try {
-            body = bodyType.getDeclaredConstructor().newInstance();
-        } catch (NoSuchMethodException |
-                 InstantiationException |
-                 IllegalAccessException |
-                 InvocationTargetException e) {
-            logger.debug(e);
-        }
-
-        getHeader().setEMsg(body.getEMsg());
-    }
-
-    /**
-     * Initializes a new instance of the {@link Msg} class.
-     * This a reply constructor.
-     *
-     * @param bodyType body type
-     * @param msg      The message that this instance is a reply for.
-     */
-    public Msg(Class<? extends BodyType> bodyType, MsgBase<MsgHdr> msg) {
-        this(bodyType, msg, 0);
-    }
-
-    /**
-     * Initializes a new instance of the {@link Msg} class.
-     * This a reply constructor.
-     *
-     * @param bodyType       body type
-     * @param msg            The message that this instance is a reply for.
-     * @param payloadReserve The number of bytes to initialize the payload capacity to.
-     */
-    public Msg(Class<? extends BodyType> bodyType, MsgBase<MsgHdr> msg, int payloadReserve) {
-        this(bodyType, payloadReserve);
-
-        if (msg == null) {
-            throw new IllegalArgumentException("msg is null");
-        }
-
-        // our target is where the message came from
-        getHeader().setTargetJobID(msg.getHeader().getSourceJobID());
-    }
-
-    /**
-     * Initializes a new instance of the {@link Msg} class.
-     * This a receive constructor.
-     *
-     * @param bodyType body type
-     * @param msg      The packet message to build this client message from.
-     */
-    public Msg(Class<? extends BodyType> bodyType, IPacketMsg msg) {
-        this(bodyType);
-
-        if (msg == null) {
-            throw new IllegalArgumentException("msg is null");
-        }
-
-        deserialize(msg.getData());
-    }
-
-    @Override
-    public boolean isProto() {
-        return false;
-    }
-
-    @Override
-    public EMsg getMsgType() {
-        return getHeader().getMsg();
-    }
-
-    @Override
-    public int getSessionID() {
-        return 0;
-    }
-
-    @Override
-    public void setSessionID(int sessionID) {
-    }
-
-    @Override
-    public SteamID getSteamID() {
-        return null;
-    }
-
-    @Override
-    public void setSteamID(SteamID steamID) {
-    }
-
-    @Override
-    public JobID getTargetJobID() {
-        return new JobID(getHeader().getTargetJobID());
-    }
-
-    @Override
-    public void setTargetJobID(JobID jobID) {
-        if (jobID == null) {
-            throw new IllegalArgumentException("jobID is null");
-        }
-        getHeader().setTargetJobID(jobID.getValue());
-    }
-
-    @Override
-    public JobID getSourceJobID() {
-        return new JobID(getHeader().getSourceJobID());
-    }
-
-    @Override
-    public void setSourceJobID(JobID jobID) {
-        if (jobID == null) {
-            throw new IllegalArgumentException("jobID is null");
-        }
-        getHeader().setSourceJobID(jobID.getValue());
-    }
-
-    @Override
-    public byte[] serialize() {
-        try (var baos = new ByteArrayOutputStream(0)) {
-            getHeader().serialize(baos);
-            body.serialize(baos);
-            baos.write(payload.toByteArray());
-
-            return baos.toByteArray();
-        } catch (IOException e) {
-            logger.debug(e);
-        }
-
-        return new byte[0];
-    }
-
-    @Override
-    public void deserialize(byte[] data) {
-        if (data == null) {
-            throw new IllegalArgumentException("data is null");
-        }
-        MemoryStream ms = new MemoryStream(data);
-
-        try {
-            getHeader().deserialize(ms);
-            body.deserialize(ms);
-        } catch (IOException e) {
-            logger.debug(e);
-        }
-
-        payload.write(data, (int) ms.getPosition(), ms.available());
-        payload.seek(0, SeekOrigin.BEGIN);
-
-        ms.close();
-    }
-
-    public BodyType getBody() {
-        return body;
-    }
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/Msg.kt b/src/main/java/in/dragonbra/javasteam/base/Msg.kt
new file mode 100644
index 00000000..b6e6a6dc
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/Msg.kt
@@ -0,0 +1,163 @@
+package `in`.dragonbra.javasteam.base
+
+import `in`.dragonbra.javasteam.enums.EMsg
+import `in`.dragonbra.javasteam.generated.MsgHdr
+import `in`.dragonbra.javasteam.types.JobID
+import `in`.dragonbra.javasteam.types.SteamID
+import `in`.dragonbra.javasteam.util.log.LogManager
+import `in`.dragonbra.javasteam.util.log.Logger
+import `in`.dragonbra.javasteam.util.stream.MemoryStream
+import `in`.dragonbra.javasteam.util.stream.SeekOrigin
+import java.io.IOException
+import java.lang.reflect.InvocationTargetException
+
+/**
+ * Represents a struct backed message without session or client info.
+ *  @constructor Initializes a new instance of the [Msg] class.
+ *  @param bodyType       body type
+ *  @param payloadReserve The number of bytes to initialize the payload capacity to.
+ */
+@Suppress("unused")
+class Msg<BodyType : ISteamSerializableMessage> @JvmOverloads constructor(
+    bodyType: Class<out BodyType>,
+    payloadReserve: Int = 0,
+) : MsgBase<MsgHdr>(MsgHdr::class.java, payloadReserve) {
+
+    companion object {
+        private val logger: Logger = LogManager.getLogger(Msg::class.java)
+    }
+
+    /**
+     * Gets the structure body of the message.
+     */
+    lateinit var body: BodyType
+        private set
+
+    /**
+     * Gets a value indicating whether this client message is protobuf backed.
+     * @return **true** if this instance is protobuf backed; otherwise, **false**.
+     */
+    override val isProto: Boolean
+        get() = false
+
+    /**
+     * Gets the network message type of this client message.
+     */
+    override val msgType: EMsg
+        get() = header.msg
+
+    /**
+     * Gets or sets the session id for this client message.
+     * This type of client message does not support session ids
+     */
+    override var sessionID: Int
+        get() = 0
+        set(value) { /* No-Op */ }
+
+    /**
+     * Gets or sets the <see cref="SteamID"/> for this client message.
+     * This type of client message goes not support [SteamID]s.
+     */
+    override var steamID: SteamID?
+        get() = null
+        set(value) { /* No-Op */ }
+
+    /**
+     * Gets or sets the target job id for this client message.
+     */
+    override var targetJobID: JobID
+        get() = JobID(header.targetJobID)
+        set(value) {
+            header.targetJobID = value.value
+        }
+
+    /**
+     * Gets or sets the source job id for this client message.
+     */
+    override var sourceJobID: JobID
+        get() = JobID(header.sourceJobID)
+        set(value) {
+            header.sourceJobID = value.value
+        }
+
+    /**
+     * Initializes a new instance of the [Msg] class.
+     * This a reply constructor.
+     * @param bodyType The body type.
+     * @param msg The message that this instance is a reply for.
+     * @param payloadReserve The number of bytes to initialize the payload capacity to.
+     */
+    @JvmOverloads
+    constructor(
+        bodyType: Class<out BodyType>,
+        msg: MsgBase<MsgHdr>,
+        payloadReserve: Int = 0,
+    ) : this(bodyType, payloadReserve) {
+        // our target is where the message came from
+        header.targetJobID = msg.header.sourceJobID
+    }
+
+    /**
+     * Initializes a new instance of the [Msg] class.
+     * This a receive constructor.
+     * @param bodyType The body type
+     * @param msg The packet message to build this client message from.
+     */
+    constructor(bodyType: Class<out BodyType>, msg: IPacketMsg) : this(bodyType) {
+        deserialize(msg.data)
+    }
+
+    init {
+        try {
+            body = bodyType.getDeclaredConstructor().newInstance()
+        } catch (e: NoSuchMethodException) {
+            logger.debug(e)
+        } catch (e: InstantiationException) {
+            logger.debug(e)
+        } catch (e: IllegalAccessException) {
+            logger.debug(e)
+        } catch (e: InvocationTargetException) {
+            logger.debug(e)
+        }
+
+        header.setEMsg(body.eMsg)
+    }
+
+    /**
+     * serializes this client message instance to a byte array.
+     * @return Data representing a client message.
+     */
+    override fun serialize(): ByteArray {
+        try {
+            MemoryStream(0).use { ms ->
+                val os = ms.asOutputStream()
+                header.serialize(os)
+                body.serialize(os)
+                os.write(payload.toByteArray())
+                return ms.toByteArray()
+            }
+        } catch (e: IOException) {
+            logger.error(e)
+        }
+
+        return ByteArray(0)
+    }
+
+    /**
+     * Initializes this client message by deserializing the specified data.
+     * @param data The data representing a client message.
+     */
+    override fun deserialize(data: ByteArray) {
+        MemoryStream(data).use { ms ->
+            try {
+                header.deserialize(ms)
+                body.deserialize(ms)
+            } catch (e: IOException) {
+                logger.error(e)
+            }
+
+            payload.write(data, ms.position.toInt(), ms.available())
+            payload.seek(0, SeekOrigin.BEGIN)
+        }
+    }
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/MsgBase.java b/src/main/java/in/dragonbra/javasteam/base/MsgBase.java
deleted file mode 100644
index 3a0ee768..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/MsgBase.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import in.dragonbra.javasteam.util.log.LogManager;
-import in.dragonbra.javasteam.util.log.Logger;
-
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * This is the abstract base class for all available client messages.
- * It's used to maintain packet payloads and provide a header for all client messages.
- */
-@SuppressWarnings("unused")
-public abstract class MsgBase<HdrType extends ISteamSerializable> extends AbstractMsgBase implements IClientMsg {
-
-    private static final Logger logger = LogManager.getLogger(MsgBase.class);
-
-    private HdrType header;
-
-    /**
-     * Initializes a new instance of the {@link MsgBase} class.
-     *
-     * @param clazz the type of the header
-     */
-    public MsgBase(Class<HdrType> clazz) {
-        this(clazz, 0);
-    }
-
-    /**
-     * Initializes a new instance of the {@link MsgBase} class.
-     *
-     * @param clazz          the type of the header
-     * @param payloadReserve The number of bytes to initialize the payload capacity to.
-     */
-    public MsgBase(Class<HdrType> clazz, int payloadReserve) {
-        super(payloadReserve);
-        try {
-            header = clazz.getDeclaredConstructor().newInstance();
-        } catch (NoSuchMethodException |
-                 InstantiationException |
-                 IllegalAccessException |
-                 InvocationTargetException e) {
-            logger.debug(e);
-        }
-    }
-
-    /**
-     * @return the header for this message type.
-     */
-    public HdrType getHeader() {
-        return header;
-    }
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/MsgBase.kt b/src/main/java/in/dragonbra/javasteam/base/MsgBase.kt
new file mode 100644
index 00000000..b48e3c6c
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/MsgBase.kt
@@ -0,0 +1,45 @@
+package `in`.dragonbra.javasteam.base
+
+import `in`.dragonbra.javasteam.util.log.LogManager
+import `in`.dragonbra.javasteam.util.log.Logger
+import java.lang.reflect.InvocationTargetException
+
+/**
+ * This is the abstract base class for all available client messages.
+ * It's used to maintain packet payloads and provide a header for all client messages.
+ * @constructor Initializes a new instance of the [MsgBase] class.
+ * @param clazz The type of the header.
+ * @param payloadReserve The number of bytes to initialize the payload capacity to.
+ * @param HdrType The header type for this message.
+ */
+@Suppress("unused")
+abstract class MsgBase<HdrType : ISteamSerializable> @JvmOverloads constructor(
+    clazz: Class<HdrType>,
+    payloadReserve: Int = 0,
+) : AbstractMsgBase(payloadReserve),
+    IClientMsg {
+
+    companion object {
+        private val logger: Logger = LogManager.getLogger(MsgBase::class.java)
+    }
+
+    /**
+     * Gets the header for this message type.
+     */
+    lateinit var header: HdrType
+        private set
+
+    init {
+        try {
+            header = clazz.getDeclaredConstructor().newInstance()
+        } catch (e: NoSuchMethodException) {
+            logger.error(e)
+        } catch (e: InstantiationException) {
+            logger.error(e)
+        } catch (e: IllegalAccessException) {
+            logger.error(e)
+        } catch (e: InvocationTargetException) {
+            logger.error(e)
+        }
+    }
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/PacketClientGCMsg.java b/src/main/java/in/dragonbra/javasteam/base/PacketClientGCMsg.java
deleted file mode 100644
index a25e87d8..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/PacketClientGCMsg.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import in.dragonbra.javasteam.generated.MsgGCHdr;
-import in.dragonbra.javasteam.types.JobID;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-/**
- * Represents a packet message with extended header information.
- */
-public class PacketClientGCMsg implements IPacketGCMsg {
-
-    private final int msgType;
-
-    private final JobID targetJobID;
-
-    private final JobID sourceJobID;
-
-    private final byte[] payload;
-
-    /**
-     * Initializes a new instance of the {@link PacketClientGCMsg} class.
-     *
-     * @param eMsg The network message type for this packet message.
-     * @param data The data.
-     */
-    public PacketClientGCMsg(int eMsg, byte[] data) {
-        if (data == null) {
-            throw new IllegalArgumentException("data is null");
-        }
-
-        msgType = eMsg;
-        payload = data;
-
-        MsgGCHdr gcHdr = new MsgGCHdr();
-
-        // we need to pull out the job ids, so we deserialize the protobuf header
-        try (var bais = new ByteArrayInputStream(data)) {
-            gcHdr.deserialize(bais);
-        } catch (IOException ignored) {
-        }
-
-        targetJobID = new JobID(gcHdr.getTargetJobID());
-        sourceJobID = new JobID(gcHdr.getSourceJobID());
-    }
-
-    @Override
-    public boolean isProto() {
-        return false;
-    }
-
-    @Override
-    public int getMsgType() {
-        return msgType;
-    }
-
-    @Override
-    public JobID getTargetJobID() {
-        return targetJobID;
-    }
-
-    @Override
-    public JobID getSourceJobID() {
-        return sourceJobID;
-    }
-
-    @Override
-    public byte[] getData() {
-        return payload;
-    }
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/PacketClientGCMsgProtobuf.java b/src/main/java/in/dragonbra/javasteam/base/PacketClientGCMsgProtobuf.java
deleted file mode 100644
index 82bdaa92..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/PacketClientGCMsgProtobuf.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import in.dragonbra.javasteam.generated.MsgGCHdrProtoBuf;
-import in.dragonbra.javasteam.types.JobID;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-/**
- * Represents a protobuf backed packet message.
- */
-public class PacketClientGCMsgProtobuf implements IPacketGCMsg {
-
-    private final int msgType;
-
-    private final JobID targetJobID;
-
-    private final JobID sourceJobID;
-
-    private final byte[] payload;
-
-    /**
-     * Initializes a new instance of the {@link PacketClientGCMsgProtobuf} class.
-     *
-     * @param eMsg The network message type for this packet message.
-     * @param data The data.
-     */
-    public PacketClientGCMsgProtobuf(int eMsg, byte[] data) {
-        if (data == null) {
-            throw new IllegalArgumentException("data is null");
-        }
-
-        msgType = eMsg;
-        payload = data;
-
-        MsgGCHdrProtoBuf protobufHeader = new MsgGCHdrProtoBuf();
-
-        // we need to pull out the job ids, so we deserialize the protobuf header
-        try (var bais = new ByteArrayInputStream(data)) {
-            protobufHeader.deserialize(bais);
-        } catch (IOException ignored) {
-        }
-
-        targetJobID = new JobID(protobufHeader.getProto().getJobidTarget());
-        sourceJobID = new JobID(protobufHeader.getProto().getJobidSource());
-    }
-
-    @Override
-    public boolean isProto() {
-        return true;
-    }
-
-    @Override
-    public int getMsgType() {
-        return msgType;
-    }
-
-    @Override
-    public JobID getTargetJobID() {
-        return targetJobID;
-    }
-
-    @Override
-    public JobID getSourceJobID() {
-        return sourceJobID;
-    }
-
-    @Override
-    public byte[] getData() {
-        return payload;
-    }
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/PacketClientMsg.java b/src/main/java/in/dragonbra/javasteam/base/PacketClientMsg.java
deleted file mode 100644
index ed14012d..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/PacketClientMsg.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import in.dragonbra.javasteam.enums.EMsg;
-import in.dragonbra.javasteam.generated.ExtendedClientMsgHdr;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-/**
- * Represents a packet message with extended header information.
- */
-public class PacketClientMsg implements IPacketMsg {
-
-    private final EMsg msgType;
-
-    private final long targetJobID;
-
-    private final long sourceJobID;
-
-    private final byte[] payload;
-
-    /**
-     * Initializes a new instance of the {@link PacketClientMsg} class.
-     *
-     * @param eMsg The network message type for this packet message.
-     * @param data The data.
-     * @throws IOException exception while deserializing the data
-     */
-    public PacketClientMsg(EMsg eMsg, byte[] data) throws IOException {
-        this.msgType = eMsg;
-        this.payload = data;
-
-        ExtendedClientMsgHdr extendedHdr = new ExtendedClientMsgHdr();
-
-        try (var stream = new ByteArrayInputStream(data)) {
-            extendedHdr.deserialize(stream);
-        }
-
-        targetJobID = extendedHdr.getTargetJobID();
-        sourceJobID = extendedHdr.getSourceJobID();
-    }
-
-    @Override
-    public boolean isProto() {
-        return false;
-    }
-
-    @Override
-    public EMsg getMsgType() {
-        return msgType;
-    }
-
-    @Override
-    public long getTargetJobID() {
-        return targetJobID;
-    }
-
-    @Override
-    public long getSourceJobID() {
-        return sourceJobID;
-    }
-
-    @Override
-    public byte[] getData() {
-        return payload;
-    }
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/PacketClientMsg.kt b/src/main/java/in/dragonbra/javasteam/base/PacketClientMsg.kt
new file mode 100644
index 00000000..4eed417b
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/PacketClientMsg.kt
@@ -0,0 +1,72 @@
+package `in`.dragonbra.javasteam.base
+
+import `in`.dragonbra.javasteam.enums.EMsg
+import `in`.dragonbra.javasteam.generated.ExtendedClientMsgHdr
+import `in`.dragonbra.javasteam.util.stream.MemoryStream
+import java.io.IOException
+
+/**
+ * Represents a packet message with extended header information.
+ * @constructor Initializes a new instance of the [PacketClientMsg] class.
+ * @param eMsg The network message type for this packet message.
+ * @param data The data.
+ * @throws IOException exception while deserializing the data
+ */
+class PacketClientMsg
+@Throws(IOException::class)
+constructor(
+    private val eMsg: EMsg,
+    data: ByteArray,
+) : IPacketMsg {
+
+    private val payload: ByteArray = data
+
+    /**
+     * Gets the header for this packet message.
+     */
+    internal val header: ExtendedClientMsgHdr = ExtendedClientMsgHdr()
+
+    /**
+     * The offset in payload after the header.
+     */
+    internal val bodyOffset: Long
+
+    /**
+     * Gets a value indicating whether this packet message is protobuf backed.
+     * This type of message is never protobuf backed.
+     */
+    override val isProto: Boolean
+        get() = false
+
+    /**
+     * Gets the network message type of this packet message.
+     */
+    override val msgType: EMsg
+        get() = eMsg
+
+    /**
+     * Gets the target job id for this packet message.
+     */
+    override val targetJobID: Long
+        get() = header.targetJobID
+
+    /**
+     * Gets the source job id for this packet message.
+     */
+    override val sourceJobID: Long
+        get() = header.sourceJobID
+
+    /**
+     * Gets the underlying data that represents this client message.
+     */
+    override val data: ByteArray
+        get() = payload
+
+    init {
+        // deserialize the extended header to get our hands on the job ids
+        MemoryStream(data).use { ms ->
+            header.deserialize(ms)
+            bodyOffset = ms.position
+        }
+    }
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/PacketClientMsgProtobuf.java b/src/main/java/in/dragonbra/javasteam/base/PacketClientMsgProtobuf.java
deleted file mode 100644
index cd01f68b..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/PacketClientMsgProtobuf.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import in.dragonbra.javasteam.enums.EMsg;
-import in.dragonbra.javasteam.generated.MsgHdrProtoBuf;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-/**
- * Represents a protobuf backed packet message.
- */
-public class PacketClientMsgProtobuf implements IPacketMsg {
-
-    private final EMsg msgType;
-
-    private final byte[] payload;
-
-    private final MsgHdrProtoBuf header;
-
-    /**
-     * Initializes a new instance of the {@link PacketClientMsgProtobuf} class.
-     *
-     * @param eMsg The network message type for this packet message.
-     * @param data The data.
-     * @throws IOException exception while deserializing the data
-     */
-    public PacketClientMsgProtobuf(EMsg eMsg, byte[] data) throws IOException {
-        this.msgType = eMsg;
-        this.payload = data;
-
-        header = new MsgHdrProtoBuf();
-
-        try (var stream = new ByteArrayInputStream(data)) {
-            header.deserialize(stream);
-        }
-    }
-
-    /**
-     * Gets the header for this packet message.
-     *
-     * @return The header.
-     */
-    public MsgHdrProtoBuf getHeader() {
-        return header;
-    }
-
-    @Override
-    public boolean isProto() {
-        return true;
-    }
-
-    @Override
-    public EMsg getMsgType() {
-        return msgType;
-    }
-
-    @Override
-    public long getTargetJobID() {
-        return header.getProto().getJobidTarget();
-    }
-
-    @Override
-    public long getSourceJobID() {
-        return header.getProto().getJobidSource();
-    }
-
-    @Override
-    public byte[] getData() {
-        return payload;
-    }
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/PacketClientMsgProtobuf.kt b/src/main/java/in/dragonbra/javasteam/base/PacketClientMsgProtobuf.kt
new file mode 100644
index 00000000..71693610
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/PacketClientMsgProtobuf.kt
@@ -0,0 +1,72 @@
+package `in`.dragonbra.javasteam.base
+
+import `in`.dragonbra.javasteam.enums.EMsg
+import `in`.dragonbra.javasteam.generated.MsgHdrProtoBuf
+import `in`.dragonbra.javasteam.util.stream.MemoryStream
+import java.io.IOException
+import kotlin.jvm.Throws
+
+/**
+ * Represents a protobuf backed packet message.
+ * @constructor Initializes a new instance of the [PacketClientMsgProtobuf] class.
+ * @param eMsg The network message type for this packet message.
+ * @param data The data.
+ */
+class PacketClientMsgProtobuf
+@Throws(IOException::class)
+constructor(
+    private val eMsg: EMsg,
+    data: ByteArray,
+) : IPacketMsg {
+
+    private val payload: ByteArray = data
+
+    /**
+     * Gets the header for this packet message.
+     */
+    internal val header: MsgHdrProtoBuf = MsgHdrProtoBuf()
+
+    /**
+     * Gets the offset in payload to the body after the header.
+     */
+    internal val bodyOffset: Long
+
+    /**
+     * Gets a value indicating whether this packet message is protobuf backed.
+     * This type of message is always protobuf backed.
+     */
+    override val isProto: Boolean
+        get() = true
+
+    /**
+     * Gets the network message type of this packet message.
+     */
+    override val msgType: EMsg
+        get() = eMsg
+
+    /**
+     * Gets the target job id for this packet message.
+     */
+    override val targetJobID: Long
+        get() = header.proto.jobidTarget
+
+    /**
+     * Gets the source job id for this packet message.
+     */
+    override val sourceJobID: Long
+        get() = header.proto.jobidSource
+
+    /**
+     * Gets the underlying data that represents this client message.
+     */
+    override val data: ByteArray
+        get() = payload
+
+    init {
+        // we need to pull out the job ids, so we deserialize the protobuf header
+        MemoryStream(data).use { ms ->
+            header.deserialize(ms)
+            bodyOffset = ms.position
+        }
+    }
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/PacketMsg.java b/src/main/java/in/dragonbra/javasteam/base/PacketMsg.java
deleted file mode 100644
index f0d49f44..00000000
--- a/src/main/java/in/dragonbra/javasteam/base/PacketMsg.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package in.dragonbra.javasteam.base;
-
-import in.dragonbra.javasteam.enums.EMsg;
-import in.dragonbra.javasteam.generated.MsgHdr;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-/**
- * Represents a packet message with basic header information.
- */
-public class PacketMsg implements IPacketMsg {
-
-    private final EMsg msgType;
-
-    private final long targetJobID;
-
-    private final long sourceJobID;
-
-    private final byte[] payload;
-
-    /**
-     * Initializes a new instance of the{@link PacketMsg} class.
-     *
-     * @param eMsg The network message type for this packet message.
-     * @param data The data.
-     * @throws IOException exception while deserializing the data
-     */
-    public PacketMsg(EMsg eMsg, byte[] data) throws IOException {
-        this.msgType = eMsg;
-        this.payload = data;
-
-        MsgHdr msgHdr = new MsgHdr();
-
-        try (var stream = new ByteArrayInputStream(data)) {
-            msgHdr.deserialize(stream);
-        }
-
-        targetJobID = msgHdr.getTargetJobID();
-        sourceJobID = msgHdr.getSourceJobID();
-    }
-
-    @Override
-    public boolean isProto() {
-        return false;
-    }
-
-    @Override
-    public EMsg getMsgType() {
-        return this.msgType;
-    }
-
-    @Override
-    public long getTargetJobID() {
-        return this.targetJobID;
-    }
-
-    @Override
-    public long getSourceJobID() {
-        return this.sourceJobID;
-    }
-
-    @Override
-    public byte[] getData() {
-        return payload;
-    }
-}
diff --git a/src/main/java/in/dragonbra/javasteam/base/PacketMsg.kt b/src/main/java/in/dragonbra/javasteam/base/PacketMsg.kt
new file mode 100644
index 00000000..49e88b79
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/PacketMsg.kt
@@ -0,0 +1,71 @@
+package `in`.dragonbra.javasteam.base
+
+import `in`.dragonbra.javasteam.enums.EMsg
+import `in`.dragonbra.javasteam.generated.MsgHdr
+import `in`.dragonbra.javasteam.util.stream.MemoryStream
+import java.io.IOException
+
+/**
+ * Represents a packet message with basic header information.
+ * Initializes a new instance of the[PacketMsg] class.
+ * @param eMsg The network message type for this packet message.
+ * @param data The data.
+ * @throws IOException exception while deserializing the data
+ */
+class PacketMsg
+@Throws(IOException::class)
+constructor(
+    private val eMsg: EMsg,
+    data: ByteArray,
+) : IPacketMsg {
+
+    private val payload: ByteArray = data
+
+    /**
+     * Gets the header for this packet message.
+     */
+    internal val header: MsgHdr = MsgHdr()
+
+    /**
+     * Gets the offset in payload to the body after the header.
+     */
+    internal val bodyOffset: Long
+
+    /**
+     * Gets a value indicating whether this packet message is protobuf backed.
+     * This type of message is never protobuf backed.
+     */
+    override val isProto: Boolean
+        get() = false
+
+    /**
+     * Gets the network message type of this packet message.
+     */
+    override val msgType: EMsg
+        get() = eMsg
+
+    /**
+     * Gets the target job id for this packet message.
+     */
+    override val targetJobID: Long
+        get() = header.targetJobID
+
+    /**
+     * Gets the source job id for this packet message.
+     */
+    override val sourceJobID: Long
+        get() = header.sourceJobID
+
+    /**
+     * Gets the underlying data that represents this client message.
+     */
+    override val data: ByteArray
+        get() = payload
+
+    init {
+        MemoryStream(data).use { ms ->
+            header.deserialize(ms)
+            bodyOffset = ms.position
+        }
+    }
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/gc/ClientGCMsg.kt b/src/main/java/in/dragonbra/javasteam/base/gc/ClientGCMsg.kt
new file mode 100644
index 00000000..4a182041
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/gc/ClientGCMsg.kt
@@ -0,0 +1,145 @@
+package `in`.dragonbra.javasteam.base.gc
+
+import `in`.dragonbra.javasteam.generated.MsgGCHdr
+import `in`.dragonbra.javasteam.types.JobID
+import `in`.dragonbra.javasteam.util.log.LogManager
+import `in`.dragonbra.javasteam.util.log.Logger
+import `in`.dragonbra.javasteam.util.stream.MemoryStream
+import `in`.dragonbra.javasteam.util.stream.SeekOrigin
+import java.io.ByteArrayOutputStream
+import java.io.IOException
+import java.lang.reflect.InvocationTargetException
+
+/**
+ * Represents a struct backed game coordinator message.
+ * @constructor Initializes a new instance of the [ClientGCMsg] class.
+ * @param bodyType The body type.
+ * @param payloadReserve The number of bytes to initialize the payload capacity to.
+ */
+@Suppress("unused")
+class ClientGCMsg<BodyType : IGCSerializableMessage> @JvmOverloads constructor(
+    bodyType: Class<out BodyType>,
+    payloadReserve: Int = 64,
+) : GCMsgBase<MsgGCHdr>(MsgGCHdr::class.java, payloadReserve) {
+
+    companion object {
+        private val logger: Logger = LogManager.getLogger(ClientGCMsg::class.java)
+    }
+
+    /**
+     * Gets the body structure of this message.
+     */
+    lateinit var body: BodyType
+
+    /**
+     * Gets a value indicating whether this gc message is protobuf backed.
+     * @return **true** if this instance is protobuf backed; otherwise, **false**
+     */
+    override val isProto: Boolean
+        get() = false
+
+    /**
+     * Gets the network message type of this gc message.
+     * @return The network message type.
+     */
+    override val msgType: Int
+        get() = body.eMsg
+
+    /**
+     * Gets or Sets the target job id for this gc message.
+     */
+    override var targetJobID: JobID
+        get() = JobID(header.targetJobID)
+        set(value) {
+            header.targetJobID = value.value
+        }
+
+    /**
+     * Gets or Sets the source job id for this gc message.
+     */
+    override var sourceJobID: JobID
+        get() = JobID(header.sourceJobID)
+        set(value) {
+            header.sourceJobID = value.value
+        }
+
+    /**
+     * Initializes a new instance of the [ClientGCMsg] class.
+     * This a reply constructor.
+     * @param bodyType The body type.
+     * @param msg The message that this instance is a reply for.
+     * @param payloadReserve The number of bytes to initialize the payload capacity to.
+     */
+    @JvmOverloads
+    constructor(bodyType: Class<out BodyType>, msg: GCMsgBase<MsgGCHdr>, payloadReserve: Int = 64) :
+        this(bodyType, payloadReserve) {
+        // our target is where the message came from
+        header.targetJobID = msg.header.sourceJobID
+    }
+
+    /**
+     * Initializes a new instance of the [ClientGCMsg] class.
+     * This a receive constructor.
+     * @param bodyType The body type.
+     * @param msg The packet message to build this client message from.
+     */
+    constructor(bodyType: Class<out BodyType>, msg: IPacketGCMsg) : this(bodyType) {
+        if (msg.isProto) {
+            logger.error("ClientMsg<${bodyType.simpleName}> used for proto message!")
+        }
+
+        deserialize(msg.data)
+    }
+
+    init {
+        try {
+            body = bodyType.getDeclaredConstructor().newInstance()
+        } catch (e: NoSuchMethodException) {
+            logger.error(e)
+        } catch (e: InstantiationException) {
+            logger.error(e)
+        } catch (e: IllegalAccessException) {
+            logger.error(e)
+        } catch (e: InvocationTargetException) {
+            logger.error(e)
+        }
+    }
+
+    /**
+     * Serializes this gc message instance to a byte array.
+     * @return The data representing a client message.
+     */
+    override fun serialize(): ByteArray {
+        try {
+            MemoryStream().use { ms ->
+                val os = ms.asOutputStream()
+                header.serialize(os)
+                body.serialize(os)
+                os.write(payload.toByteArray())
+                return ms.toByteArray()
+            }
+        } catch (e: IOException) {
+            logger.error(e)
+        }
+
+        return ByteArray(0)
+    }
+
+    /**
+     * Initializes this gc message by deserializing the specified data.
+     * @param data The data representing a client message.
+     */
+    override fun deserialize(data: ByteArray) {
+        MemoryStream(data).use { ms ->
+            try {
+                header.deserialize(ms)
+                body.deserialize(ms)
+            } catch (e: IOException) {
+                logger.error(e)
+            }
+
+            payload.write(data, ms.position.toInt(), ms.available())
+            payload.seek(0, SeekOrigin.BEGIN)
+        }
+    }
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/gc/ClientGCMsgProtobuf.kt b/src/main/java/in/dragonbra/javasteam/base/gc/ClientGCMsgProtobuf.kt
new file mode 100644
index 00000000..3867f470
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/gc/ClientGCMsgProtobuf.kt
@@ -0,0 +1,172 @@
+package `in`.dragonbra.javasteam.base.gc
+
+import com.google.protobuf.AbstractMessage
+import com.google.protobuf.GeneratedMessage
+import `in`.dragonbra.javasteam.generated.MsgGCHdrProtoBuf
+import `in`.dragonbra.javasteam.protobufs.steamclient.SteammessagesBase
+import `in`.dragonbra.javasteam.types.JobID
+import `in`.dragonbra.javasteam.util.log.LogManager
+import `in`.dragonbra.javasteam.util.log.Logger
+import `in`.dragonbra.javasteam.util.stream.MemoryStream
+import `in`.dragonbra.javasteam.util.stream.SeekOrigin
+import java.io.IOException
+import java.lang.reflect.InvocationTargetException
+
+/**
+ * Represents a protobuf backed game coordinator message.
+ * @constructor Initializes a new instance of the [ClientGCMsgProtobuf] class.
+ * This is a client send constructor.
+ * @param clazz The type of the body.
+ * @param eMsg The network message type this client message represents.
+ * @param payloadReserve The number of bytes to initialize the payload capacity to.
+ */
+@Suppress("unused")
+class ClientGCMsgProtobuf<BodyType : GeneratedMessage.Builder<BodyType>> @JvmOverloads constructor(
+    private val clazz: Class<out AbstractMessage>,
+    eMsg: Int,
+    payloadReserve: Int = 64,
+) : GCMsgBase<MsgGCHdrProtoBuf>(MsgGCHdrProtoBuf::class.java, payloadReserve) {
+
+    companion object {
+        private val logger: Logger = LogManager.getLogger(ClientGCMsgProtobuf::class.java)
+    }
+
+    /**
+     * Gets the body structure of this message.
+     */
+    lateinit var body: BodyType
+        private set
+
+    /**
+     * Shorthand accessor for the protobuf header.
+     */
+    val protoHeader: SteammessagesBase.CMsgProtoBufHeader.Builder
+        get() = header.proto
+
+    /**
+     * Gets a value indicating whether this gc message is protobuf backed.
+     * Client messages of this type are always protobuf backed.
+     * @return **true** if this instance is protobuf backed; otherwise, **false**
+     */
+    override val isProto: Boolean
+        get() = true
+
+    /**
+     * Gets the network message type of this gc message.
+     * @return The network message type.
+     */
+    override val msgType: Int
+        get() = header.msg
+
+    /**
+     * Gets or sets the target job id for this gc message.
+     */
+    override var targetJobID: JobID
+        get() = JobID(protoHeader.jobidTarget)
+        set(value) {
+            protoHeader.jobidTarget = value.value
+        }
+
+    /**
+     * Gets or sets the source job id for this gc message.
+     */
+    override var sourceJobID: JobID
+        get() = JobID(protoHeader.jobidSource)
+        set(value) {
+            protoHeader.jobidSource = value.value
+        }
+
+    /**
+     * Initializes a new instance of the [ClientGCMsgProtobuf] class.
+     * This is a client send constructor.
+     * @param clazz The type of the body.
+     * @param msg The network message type this client message represents.
+     */
+    constructor(clazz: Class<out AbstractMessage>, msg: IPacketGCMsg) : this(clazz, msg.msgType) {
+        if (!msg.isProto) {
+            logger.debug("ClientMsgProtobuf<${clazz.simpleName}> used for non-proto message!")
+        }
+
+        deserialize(msg.data)
+    }
+
+    /**
+     * Initializes a new instance of the [ClientGCMsgProtobuf] class.
+     * This is a reply constructor.
+     * @param clazz The type of the body.
+     * @param eMsg The network message type this client message represents.
+     * @param msg  The message that this instance is a reply for.
+     * @param payloadReserve The number of bytes to initialize the payload capacity to.
+     */
+    @JvmOverloads
+    constructor(
+        clazz: Class<out AbstractMessage>,
+        eMsg: Int,
+        msg: GCMsgBase<MsgGCHdrProtoBuf>,
+        payloadReserve: Int = 64,
+    ) : this(clazz, eMsg, payloadReserve) {
+        // our target is where the message came from
+        header.proto.setJobidTarget(msg.header.proto.jobidSource)
+    }
+
+    init {
+        try {
+            val m = clazz.getMethod("newBuilder")
+            @Suppress("UNCHECKED_CAST")
+            body = m.invoke(null) as BodyType
+        } catch (e: IllegalAccessException) {
+            logger.error(e)
+        } catch (e: NoSuchMethodException) {
+            logger.error(e)
+        } catch (e: InvocationTargetException) {
+            logger.error(e)
+        }
+
+        header.setEMsg(eMsg)
+    }
+
+    /**
+     * Serializes this gc message instance to a byte array.
+     * @return The data representing a gc message.
+     */
+    override fun serialize(): ByteArray {
+        try {
+            MemoryStream().use { ms ->
+                val os = ms.asOutputStream()
+                header.serialize(os)
+                body.build().writeTo(os)
+                os.write(payload.toByteArray())
+                return ms.toByteArray()
+            }
+        } catch (_: IOException) {
+        }
+
+        return ByteArray(0)
+    }
+
+    /**
+     * Initializes this gc message by deserializing the specified data.
+     * @param data The data representing a gc message.
+     */
+    override fun deserialize(data: ByteArray) {
+        try {
+            MemoryStream(data).use { ms ->
+                header.deserialize(ms)
+                val m = clazz.getMethod("newBuilder")
+                @Suppress("UNCHECKED_CAST")
+                body = m.invoke(null) as BodyType
+                body.mergeFrom(ms)
+                payload.write(data, ms.position.toInt(), ms.available())
+                payload.seek(0, SeekOrigin.BEGIN)
+            }
+        } catch (e: IOException) {
+            logger.error(e)
+        } catch (e: IllegalAccessException) {
+            logger.error(e)
+        } catch (e: NoSuchMethodException) {
+            logger.error(e)
+        } catch (e: InvocationTargetException) {
+            logger.error(e)
+        }
+    }
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/gc/GCMsgBase.kt b/src/main/java/in/dragonbra/javasteam/base/gc/GCMsgBase.kt
new file mode 100644
index 00000000..7df14394
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/gc/GCMsgBase.kt
@@ -0,0 +1,46 @@
+package `in`.dragonbra.javasteam.base.gc
+
+import `in`.dragonbra.javasteam.base.AbstractMsgBase
+import `in`.dragonbra.javasteam.util.log.LogManager
+import `in`.dragonbra.javasteam.util.log.Logger
+import java.lang.reflect.InvocationTargetException
+
+/**
+ * This is the abstract base class for all available game coordinator messages.
+ * It's used to maintain packet payloads and provide a header for all gc messages.
+ * @constructor Initializes a new instance of the [GCMsgBase] class.
+ * @param clazz The type of the header.
+ * @param payloadReserve The number of bytes to initialize the payload capacity to.
+ * @param HdrType The header type for this gc message.
+ */
+@Suppress("unused")
+abstract class GCMsgBase<HdrType : IGCSerializableHeader> @JvmOverloads constructor(
+    clazz: Class<HdrType>,
+    payloadReserve: Int = 0,
+) : AbstractMsgBase(payloadReserve),
+    IClientGCMsg {
+
+    companion object {
+        private val logger: Logger = LogManager.getLogger(GCMsgBase::class.java)
+    }
+
+    /**
+     * Gets the header for this message type.
+     */
+    lateinit var header: HdrType
+        private set
+
+    init {
+        try {
+            header = clazz.getDeclaredConstructor().newInstance()
+        } catch (e: NoSuchMethodException) {
+            logger.error(e)
+        } catch (e: InstantiationException) {
+            logger.error(e)
+        } catch (e: IllegalAccessException) {
+            logger.error(e)
+        } catch (e: InvocationTargetException) {
+            logger.error(e)
+        }
+    }
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/gc/IClientGCMsg.kt b/src/main/java/in/dragonbra/javasteam/base/gc/IClientGCMsg.kt
new file mode 100644
index 00000000..1cd0eb2c
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/gc/IClientGCMsg.kt
@@ -0,0 +1,44 @@
+package `in`.dragonbra.javasteam.base.gc
+
+import `in`.dragonbra.javasteam.types.JobID
+
+/**
+ * Represents a unified interface into client messages.
+ */
+@Suppress("unused")
+interface IClientGCMsg {
+
+    /**
+     * Gets a value indicating whether this client message is protobuf backed.
+     * @return **true** if this instance is protobuf backed; otherwise, **false**.
+     */
+    val isProto: Boolean
+
+    /**
+     * Gets the network message type of this client message.
+     * @return The message type.
+     */
+    val msgType: Int
+
+    /**
+     * Gets or Sets the target job id for this client message.
+     */
+    var targetJobID: JobID
+
+    /**
+     * Gets or Sets the source job id for this client message.
+     */
+    var sourceJobID: JobID
+
+    /**
+     * serializes this client message instance to a byte array.
+     * @return Data representing a client message.
+     */
+    fun serialize(): ByteArray
+
+    /**
+     * Initializes this client message by deserializing the specified data.
+     * @param data The data representing a client message.
+     */
+    fun deserialize(data: ByteArray)
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/gc/IGCSerializableHeader.kt b/src/main/java/in/dragonbra/javasteam/base/gc/IGCSerializableHeader.kt
new file mode 100644
index 00000000..27c818a8
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/gc/IGCSerializableHeader.kt
@@ -0,0 +1,11 @@
+package `in`.dragonbra.javasteam.base.gc
+
+import `in`.dragonbra.javasteam.base.ISteamSerializable
+
+/**
+ * @author lngtr
+ * @since 2018-02-21
+ */
+interface IGCSerializableHeader : ISteamSerializable {
+    fun setEMsg(msg: Int)
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/gc/IGCSerializableMessage.kt b/src/main/java/in/dragonbra/javasteam/base/gc/IGCSerializableMessage.kt
new file mode 100644
index 00000000..0a967a88
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/gc/IGCSerializableMessage.kt
@@ -0,0 +1,11 @@
+package `in`.dragonbra.javasteam.base.gc
+
+import `in`.dragonbra.javasteam.base.ISteamSerializable
+
+/**
+ * @author lngtr
+ * @since 2018-02-21
+ */
+interface IGCSerializableMessage : ISteamSerializable {
+    val eMsg: Int
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/IPacketGCMsg.java b/src/main/java/in/dragonbra/javasteam/base/gc/IPacketGCMsg.kt
similarity index 62%
rename from src/main/java/in/dragonbra/javasteam/base/IPacketGCMsg.java
rename to src/main/java/in/dragonbra/javasteam/base/gc/IPacketGCMsg.kt
index 5ea9cf95..f309f2fb 100644
--- a/src/main/java/in/dragonbra/javasteam/base/IPacketGCMsg.java
+++ b/src/main/java/in/dragonbra/javasteam/base/gc/IPacketGCMsg.kt
@@ -1,47 +1,42 @@
-package in.dragonbra.javasteam.base;
+package `in`.dragonbra.javasteam.base.gc
 
-import in.dragonbra.javasteam.types.JobID;
+import `in`.dragonbra.javasteam.types.JobID
 
 /**
  * Represents a simple unified interface into game coordinator messages recieved from the network.
- * This is contrasted with {@link IClientGCMsg} in that this interface is packet body agnostic
+ * This is contrasted with [IClientGCMsg] in that this interface is packet body agnostic
  * and only allows simple access into the header. This interface is also immutable, and the underlying
  * data cannot be modified.
  */
-public interface IPacketGCMsg {
+interface IPacketGCMsg {
 
     /**
      * Gets a value indicating whether this packet message is protobuf backed.
-     *
-     * @return <b>true</b> if this instance is protobuf backed; otherwise, <b>false</b>.
+     * @return **true** if this instance is protobuf backed; otherwise, **false**.
      */
-    boolean isProto();
+    val isProto: Boolean
 
     /**
      * Gets the network message type of this packet message.
-     *
      * @return The message type.
      */
-    int getMsgType();
+    val msgType: Int
 
     /**
      * Gets the target job id for this packet message.
-     *
      * @return The target job id.
      */
-    JobID getTargetJobID();
+    val targetJobID: JobID
 
     /**
      * Gets the source job id for this packet message.
-     *
      * @return The source job id.
      */
-    JobID getSourceJobID();
+    val sourceJobID: JobID
 
     /**
      * Gets the underlying data that represents this client message.
-     *
      * @return The data.
      */
-    byte[] getData();
+    val data: ByteArray
 }
diff --git a/src/main/java/in/dragonbra/javasteam/base/gc/PacketClientGCMsg.kt b/src/main/java/in/dragonbra/javasteam/base/gc/PacketClientGCMsg.kt
new file mode 100644
index 00000000..3aff9e3b
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/gc/PacketClientGCMsg.kt
@@ -0,0 +1,60 @@
+package `in`.dragonbra.javasteam.base.gc
+
+import `in`.dragonbra.javasteam.generated.MsgGCHdr
+import `in`.dragonbra.javasteam.types.JobID
+import `in`.dragonbra.javasteam.util.stream.MemoryStream
+import java.io.IOException
+
+/**
+ * Represents a packet message with extended header information.
+ * @constructor Initializes a new instance of the [PacketClientGCMsg] class.
+ * @param eMsg The network message type for this packet message.
+ * @param data The data.
+ */
+class PacketClientGCMsg(private val eMsg: Int, data: ByteArray) : IPacketGCMsg {
+
+    private val gcHdr: MsgGCHdr = MsgGCHdr()
+
+    private val payload: ByteArray = data
+
+    /**
+     * Gets a value indicating whether this packet message is protobuf backed.
+     * This type of message is never protobuf backed.
+     */
+    override val isProto: Boolean
+        get() = false
+
+    /**
+     *  Gets the network message type of this packet message.
+     */
+    override val msgType: Int
+        get() = eMsg
+
+    /**
+     * Gets the target job id for this packet message.
+     */
+    override val targetJobID: JobID
+        get() = JobID(gcHdr.targetJobID)
+
+    /**
+     * Gets the source job id for this packet message.
+     */
+    override val sourceJobID: JobID
+        get() = JobID(gcHdr.sourceJobID)
+
+    /**
+     * Gets the underlying data that represents this packet message.
+     */
+    override val data: ByteArray
+        get() = payload
+
+    init {
+        // deserialize the gc header to get our hands on the job ids
+        try {
+            MemoryStream(data).use { ms ->
+                gcHdr.deserialize(ms)
+            }
+        } catch (_: IOException) {
+        }
+    }
+}
diff --git a/src/main/java/in/dragonbra/javasteam/base/gc/PacketClientGCMsgProtobuf.kt b/src/main/java/in/dragonbra/javasteam/base/gc/PacketClientGCMsgProtobuf.kt
new file mode 100644
index 00000000..3ece8b2b
--- /dev/null
+++ b/src/main/java/in/dragonbra/javasteam/base/gc/PacketClientGCMsgProtobuf.kt
@@ -0,0 +1,60 @@
+package `in`.dragonbra.javasteam.base.gc
+
+import `in`.dragonbra.javasteam.generated.MsgGCHdrProtoBuf
+import `in`.dragonbra.javasteam.types.JobID
+import `in`.dragonbra.javasteam.util.stream.MemoryStream
+import java.io.IOException
+
+/**
+ * Represents a protobuf backed packet message.
+ * @constructor Initializes a new instance of the [PacketClientGCMsgProtobuf] class.
+ * @param eMsg The network message type for this packet message.
+ * @param data The data.
+ */
+class PacketClientGCMsgProtobuf(private val eMsg: Int, data: ByteArray) : IPacketGCMsg {
+
+    private val protobufHeader: MsgGCHdrProtoBuf = MsgGCHdrProtoBuf()
+
+    private val payload: ByteArray = data
+
+    /**
+     * Gets a value indicating whether this packet message is protobuf backed.
+     * This type of message is always protobuf backed.
+     */
+    override val isProto: Boolean
+        get() = true
+
+    /**
+     * Gets the network message type of this packet message.
+     */
+    override val msgType: Int
+        get() = eMsg
+
+    /**
+     * Gets the target job id for this packet message.
+     */
+    override val targetJobID: JobID
+        get() = JobID(protobufHeader.proto.jobidTarget)
+
+    /**
+     * Gets the source job id for this packet message.
+     */
+    override val sourceJobID: JobID
+        get() = JobID(protobufHeader.proto.jobidSource)
+
+    /**
+     * Gets the underlying data that represents this client message.
+     */
+    override val data: ByteArray
+        get() = payload
+
+    init {
+        // we need to pull out the job ids, so we deserialize the protobuf header
+        try {
+            MemoryStream(data).use { ms ->
+                protobufHeader.deserialize(ms)
+            }
+        } catch (_: IOException) {
+        }
+    }
+}
diff --git a/src/main/java/in/dragonbra/javasteam/networking/steam3/WebSocketConnection.kt b/src/main/java/in/dragonbra/javasteam/networking/steam3/WebSocketConnection.kt
index b0a4212d..fe8b3d2d 100644
--- a/src/main/java/in/dragonbra/javasteam/networking/steam3/WebSocketConnection.kt
+++ b/src/main/java/in/dragonbra/javasteam/networking/steam3/WebSocketConnection.kt
@@ -86,8 +86,13 @@ class WebSocketConnection :
                                 }
 
                                 is Frame.Close -> disconnect(false)
-                                is Frame.Ping -> logger.debug("Received pong") // Never Used.
-                                is Frame.Pong -> logger.debug("Received pong") // Never Used.
+
+                                is Frame.Ping -> logger.debug("Received pong")
+
+                                // Never Used.
+                                is Frame.Pong -> logger.debug("Received pong")
+
+                                // Never Used.
                                 is Frame.Text -> logger.debug("Received plain text ${frame.readText()}")
                             }
                         }
diff --git a/src/main/java/in/dragonbra/javasteam/steam/authentication/AuthSession.kt b/src/main/java/in/dragonbra/javasteam/steam/authentication/AuthSession.kt
index 0bf1b8c7..5f3cce65 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/authentication/AuthSession.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/authentication/AuthSession.kt
@@ -82,7 +82,9 @@ open class AuthSession(
 
             var pollLoop = false
             when (preferredConfirmation.confirmationType) {
-                EAuthSessionGuardType.k_EAuthSessionGuardType_None -> Unit // No steam guard
+                EAuthSessionGuardType.k_EAuthSessionGuardType_None -> Unit
+
+                // No steam guard
                 EAuthSessionGuardType.k_EAuthSessionGuardType_EmailCode,
                 EAuthSessionGuardType.k_EAuthSessionGuardType_DeviceCode,
                 -> {
@@ -94,6 +96,7 @@ open class AuthSession(
                     // This is a prompt that appears in the Steam mobile app
                     pollLoop = true
                 }
+
                 // SessionGuardType.k_EAuthSessionGuardType_EmailConfirmation -> Unit // Unknown
                 // SessionGuardType.k_EAuthSessionGuardType_MachineToken -> Unit // Unknown
                 else -> throw AuthenticationException(
diff --git a/src/main/java/in/dragonbra/javasteam/steam/cdn/ClientLancache.kt b/src/main/java/in/dragonbra/javasteam/steam/cdn/ClientLancache.kt
index eb3238ae..0108af47 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/cdn/ClientLancache.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/cdn/ClientLancache.kt
@@ -59,7 +59,9 @@ object ClientLancache {
                 192 -> bytes[1].toInt() and 0xFF == 168
                 else -> false
             }
+
             is Inet6Address -> (bytes[0].toInt() and 0xFE) == 0xFC || toTest.isLinkLocalAddress
+
             else -> false
         }
     }
diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/callback/EncryptedAppTicketCallback.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/callback/EncryptedAppTicketCallback.kt
index ad3cfba2..10847e0f 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/callback/EncryptedAppTicketCallback.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/callback/EncryptedAppTicketCallback.kt
@@ -7,10 +7,12 @@ import `in`.dragonbra.javasteam.protobufs.steamclient.EncryptedAppTicketOuterCla
 import `in`.dragonbra.javasteam.protobufs.steamclient.SteammessagesClientserver.CMsgClientRequestEncryptedAppTicketResponse
 import `in`.dragonbra.javasteam.steam.handlers.steamapps.SteamApps
 import `in`.dragonbra.javasteam.steam.steamclient.callbackmgr.CallbackMsg
+import `in`.dragonbra.javasteam.util.JavaSteamAddition
 
 /**
  * This callback is received in response to calling [SteamApps.requestEncryptedAppTicket]
  */
+@JavaSteamAddition
 class EncryptedAppTicketCallback(packetMsg: IPacketMsg) : CallbackMsg() {
 
     /**
diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/callback/PICSProductInfoCallback.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/callback/PICSProductInfoCallback.kt
index ab92651f..f67cfa25 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/callback/PICSProductInfoCallback.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/callback/PICSProductInfoCallback.kt
@@ -5,7 +5,6 @@ import `in`.dragonbra.javasteam.base.IPacketMsg
 import `in`.dragonbra.javasteam.protobufs.steamclient.SteammessagesClientserverAppinfo.CMsgClientPICSProductInfoResponse
 import `in`.dragonbra.javasteam.steam.handlers.steamapps.PICSProductInfo
 import `in`.dragonbra.javasteam.steam.steamclient.callbackmgr.CallbackMsg
-import java.util.*
 
 /**
  * This callback is fired when the PICS returns the product information requested
diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamcontent/SteamContent.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamcontent/SteamContent.kt
index c38bdd3c..335530c3 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamcontent/SteamContent.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamcontent/SteamContent.kt
@@ -38,7 +38,7 @@ class SteamContent : ClientMsgHandler() {
         parentScope: CoroutineScope,
     ): Deferred<List<Server>> = parentScope.async {
         val request = CContentServerDirectory_GetServersForSteamPipe_Request.newBuilder().apply {
-            this.cellId = cellId ?: client.cellID?.toInt() ?: 0
+            this.cellId = cellId ?: client.cellID ?: 0
             maxNumServers?.let { this.maxServers = it }
         }.build()
 
diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamfriends/SteamFriends.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamfriends/SteamFriends.kt
index 4091d9a9..d4f60f69 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamfriends/SteamFriends.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamfriends/SteamFriends.kt
@@ -328,7 +328,7 @@ class SteamFriends : ClientMsgHandler() {
      * @param steamID The clan steamid.
      * @return The relationship of the clan to the local user.
      */
-    fun getClanRelationship(steamID: SteamID): EClanRelationship? = cache.clans.getAccount(steamID).relationship
+    fun getClanRelationship(steamID: SteamID): EClanRelationship = cache.clans.getAccount(steamID).relationship
 
     /**
      * Gets an SHA-1 hash representing the clan's avatar.
diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamfriends/callback/ChatMemberInfoCallback.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamfriends/callback/ChatMemberInfoCallback.kt
index 4b4e5b70..3bc98725 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamfriends/callback/ChatMemberInfoCallback.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamfriends/callback/ChatMemberInfoCallback.kt
@@ -48,6 +48,7 @@ class ChatMemberInfoCallback(packetMsg: IPacketMsg) : CallbackMsg() {
 
         when (type) {
             EChatInfoType.StateChange -> stateChangeInfo = StateChangeDetails(membInfo.payload)
+
             // todo: (SK) handle more types
             // based off disassembly
             //   - for InfoUpdate, a ChatMemberInfo object is present
diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamgamecoordinator/SteamGameCoordinator.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamgamecoordinator/SteamGameCoordinator.kt
index a80b0b8c..4b60219b 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamgamecoordinator/SteamGameCoordinator.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamgamecoordinator/SteamGameCoordinator.kt
@@ -2,8 +2,8 @@ package `in`.dragonbra.javasteam.steam.handlers.steamgamecoordinator
 
 import com.google.protobuf.ByteString
 import `in`.dragonbra.javasteam.base.ClientMsgProtobuf
-import `in`.dragonbra.javasteam.base.IClientGCMsg
 import `in`.dragonbra.javasteam.base.IPacketMsg
+import `in`.dragonbra.javasteam.base.gc.IClientGCMsg
 import `in`.dragonbra.javasteam.enums.EMsg
 import `in`.dragonbra.javasteam.protobufs.steamclient.SteammessagesClientserver2.CMsgGCClient
 import `in`.dragonbra.javasteam.steam.handlers.ClientMsgHandler
@@ -24,7 +24,7 @@ class SteamGameCoordinator : ClientMsgHandler() {
     fun send(msg: IClientGCMsg, appId: Int) {
         val clientMsg = ClientMsgProtobuf<CMsgGCClient.Builder>(CMsgGCClient::class.java, EMsg.ClientToGC).apply {
             protoHeader.routingAppid = appId
-            body.msgtype = MsgUtil.makeGCMsg(msg.getMsgType(), msg.isProto())
+            body.msgtype = MsgUtil.makeGCMsg(msg.msgType, msg.isProto)
             body.appid = appId
 
             body.payload = ByteString.copyFrom(msg.serialize())
diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamgamecoordinator/callback/MessageCallback.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamgamecoordinator/callback/MessageCallback.kt
index 4ac5593d..16adc59b 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamgamecoordinator/callback/MessageCallback.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamgamecoordinator/callback/MessageCallback.kt
@@ -1,10 +1,10 @@
 package `in`.dragonbra.javasteam.steam.handlers.steamgamecoordinator.callback
 
 import `in`.dragonbra.javasteam.base.ClientMsgProtobuf
-import `in`.dragonbra.javasteam.base.IPacketGCMsg
 import `in`.dragonbra.javasteam.base.IPacketMsg
-import `in`.dragonbra.javasteam.base.PacketClientGCMsg
-import `in`.dragonbra.javasteam.base.PacketClientGCMsgProtobuf
+import `in`.dragonbra.javasteam.base.gc.IPacketGCMsg
+import `in`.dragonbra.javasteam.base.gc.PacketClientGCMsg
+import `in`.dragonbra.javasteam.base.gc.PacketClientGCMsgProtobuf
 import `in`.dragonbra.javasteam.protobufs.steamclient.SteammessagesClientserver2.CMsgGCClient
 import `in`.dragonbra.javasteam.steam.steamclient.callbackmgr.CallbackMsg
 import `in`.dragonbra.javasteam.util.MsgUtil
diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steammatchmaking/SteamMatchmaking.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steammatchmaking/SteamMatchmaking.kt
index 139f2c09..11656978 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steammatchmaking/SteamMatchmaking.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steammatchmaking/SteamMatchmaking.kt
@@ -273,11 +273,7 @@ class SteamMatchmaking : ClientMsgHandler() {
         appId: Int,
         lobbySteamId: SteamID,
     ): AsyncJobSingle<JoinLobbyCallback>? {
-        val personaName = client.getHandler<SteamFriends>()?.getPersonaName()
-
-        if (personaName == null) {
-            return null
-        }
+        val personaName = client.getHandler<SteamFriends>()?.getPersonaName() ?: return null
 
         val joinLobby = ClientMsgProtobuf<CMsgClientMMSJoinLobby.Builder>(
             CMsgClientMMSJoinLobby::class.java,
diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamunifiedmessages/SteamUnifiedMessages.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamunifiedmessages/SteamUnifiedMessages.kt
index 570a2336..ddfebb6e 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamunifiedmessages/SteamUnifiedMessages.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamunifiedmessages/SteamUnifiedMessages.kt
@@ -93,7 +93,7 @@ class SteamUnifiedMessages : ClientMsgHandler() {
 
         val msg = ClientMsgProtobuf<TRequest>(message::class.java, eMsg).apply {
             sourceJobID = client.getNextJobID()
-            header.proto.targetJobName = name
+            header!!.proto.targetJobName = name
             body.mergeFrom(message)
         }
 
@@ -120,7 +120,7 @@ class SteamUnifiedMessages : ClientMsgHandler() {
             EMsg.ServiceMethodCallFromClient
         }
         val msg = ClientMsgProtobuf<TRequest>(message::class.java, eMsg).apply {
-            header.proto.targetJobName = name
+            header!!.proto.targetJobName = name
             body.mergeFrom(message)
         }
 
@@ -146,7 +146,7 @@ class SteamUnifiedMessages : ClientMsgHandler() {
         val hash = jobName.lastIndexOf('#')
         if (dot < 0 || hash < 0) return
 
-        val serviceName = jobName.substring(0, dot)
+        val serviceName = jobName.take(dot)
         val handler = handlers[serviceName] ?: return
         val methodName = jobName.substring(dot + 1, hash)
 
diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuser/SteamUser.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuser/SteamUser.kt
index 9f859ee4..3bdb414d 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuser/SteamUser.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuser/SteamUser.kt
@@ -34,6 +34,7 @@ import `in`.dragonbra.javasteam.util.NetHelpers
 /**
  * This handler handles all user log on/log off related actions and callbacks.
  */
+@Suppress("unused")
 class SteamUser : ClientMsgHandler() {
 
     val steamID: SteamID?
diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/SteamUserStats.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/SteamUserStats.kt
index f7f2f79f..239904d2 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/SteamUserStats.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/SteamUserStats.kt
@@ -186,7 +186,7 @@ class SteamUserStats : ClientMsgHandler() {
     }
 
     companion object {
-        private fun getCallback(packetMsg: IPacketMsg): CallbackMsg? = when (packetMsg.getMsgType()) {
+        private fun getCallback(packetMsg: IPacketMsg): CallbackMsg? = when (packetMsg.msgType) {
             EMsg.ClientGetNumberOfCurrentPlayersDPResponse -> NumberOfPlayersCallback(packetMsg)
             EMsg.ClientLBSFindOrCreateLBResponse -> FindOrCreateLeaderboardCallback(packetMsg)
             EMsg.ClientLBSGetLBEntriesResponse -> LeaderboardEntriesCallback(packetMsg)
diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/callback/FindOrCreateLeaderboardCallback.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/callback/FindOrCreateLeaderboardCallback.kt
index b6593e4e..16995719 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/callback/FindOrCreateLeaderboardCallback.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/callback/FindOrCreateLeaderboardCallback.kt
@@ -13,7 +13,7 @@ import `in`.dragonbra.javasteam.steam.steamclient.callbackmgr.CallbackMsg
  * This callback is fired in response to [SteamUserStats.findLeaderBoard] and [SteamUserStats.createLeaderboard].
  */
 @Suppress("MemberVisibilityCanBePrivate")
-class FindOrCreateLeaderboardCallback(packetMsg: IPacketMsg?) : CallbackMsg() {
+class FindOrCreateLeaderboardCallback(packetMsg: IPacketMsg) : CallbackMsg() {
 
     /**
      * Gets the result of the request.
diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/callback/LeaderboardEntriesCallback.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/callback/LeaderboardEntriesCallback.kt
index 2e178f5e..500deb7c 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/callback/LeaderboardEntriesCallback.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/callback/LeaderboardEntriesCallback.kt
@@ -12,7 +12,7 @@ import `in`.dragonbra.javasteam.steam.steamclient.callbackmgr.CallbackMsg
  * This callback is fired in response to [SteamUserStats.getLeaderboardEntries].
  */
 @Suppress("MemberVisibilityCanBePrivate")
-class LeaderboardEntriesCallback(packetMsg: IPacketMsg?) : CallbackMsg() {
+class LeaderboardEntriesCallback(packetMsg: IPacketMsg) : CallbackMsg() {
 
     /**
      * Gets the result of the request.
diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/callback/NumberOfPlayersCallback.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/callback/NumberOfPlayersCallback.kt
index 97288d0e..99203c73 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/callback/NumberOfPlayersCallback.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/callback/NumberOfPlayersCallback.kt
@@ -11,7 +11,7 @@ import `in`.dragonbra.javasteam.steam.steamclient.callbackmgr.CallbackMsg
  * This callback is fired in response to [SteamUserStats.getNumberOfCurrentPlayers].
  */
 @Suppress("MemberVisibilityCanBePrivate")
-class NumberOfPlayersCallback(packetMsg: IPacketMsg?) : CallbackMsg() {
+class NumberOfPlayersCallback(packetMsg: IPacketMsg) : CallbackMsg() {
 
     /**
      * Gets the result of the request.
diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/callback/UserStatsCallback.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/callback/UserStatsCallback.kt
index 0127bfcf..610a6dfd 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/callback/UserStatsCallback.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuserstats/callback/UserStatsCallback.kt
@@ -17,7 +17,7 @@ import `in`.dragonbra.javasteam.util.stream.MemoryStream
  * This callback is fired in response to [SteamUserStats.getUserStats].
  */
 @JavaSteamAddition
-class UserStatsCallback(packetMsg: IPacketMsg?) : CallbackMsg() {
+class UserStatsCallback(packetMsg: IPacketMsg) : CallbackMsg() {
 
     /**
      * Gets the result.
diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamworkshop/SteamWorkshop.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamworkshop/SteamWorkshop.kt
index d9bd8034..9e0df32e 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamworkshop/SteamWorkshop.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamworkshop/SteamWorkshop.kt
@@ -51,7 +51,7 @@ class SteamWorkshop : ClientMsgHandler() {
     }
 
     companion object {
-        private fun getCallback(packetMsg: IPacketMsg): CallbackMsg? = when (packetMsg.getMsgType()) {
+        private fun getCallback(packetMsg: IPacketMsg): CallbackMsg? = when (packetMsg.msgType) {
             EMsg.ClientUCMEnumeratePublishedFilesByUserActionResponse -> UserActionPublishedFilesCallback(packetMsg)
             else -> null
         }
diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamworkshop/callback/UserActionPublishedFilesCallback.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamworkshop/callback/UserActionPublishedFilesCallback.kt
index cf0d67f0..09132e27 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamworkshop/callback/UserActionPublishedFilesCallback.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamworkshop/callback/UserActionPublishedFilesCallback.kt
@@ -12,7 +12,7 @@ import java.util.*
  * This callback is received in response to calling [SteamWorkshop.enumeratePublishedFilesByUserAction].
  */
 @Suppress("MemberVisibilityCanBePrivate", "unused")
-class UserActionPublishedFilesCallback(packetMsg: IPacketMsg?) : CallbackMsg() {
+class UserActionPublishedFilesCallback(packetMsg: IPacketMsg) : CallbackMsg() {
 
     /**
      * Gets the result.
diff --git a/src/main/java/in/dragonbra/javasteam/steam/steamclient/SteamClient.kt b/src/main/java/in/dragonbra/javasteam/steam/steamclient/SteamClient.kt
index 1872ff77..9ea0928b 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/steamclient/SteamClient.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/steamclient/SteamClient.kt
@@ -231,7 +231,7 @@ class SteamClient @JvmOverloads constructor(
         }
 
         // we want to handle some of the clientMsg's before we pass them along to registered handlers
-        when (packetMsg.getMsgType()) {
+        when (packetMsg.msgType) {
             EMsg.JobHeartbeat -> handleJobHeartbeat(packetMsg)
             EMsg.DestJobFailed -> handleJobFailed(packetMsg)
             else -> Unit
@@ -283,11 +283,11 @@ class SteamClient @JvmOverloads constructor(
     }
 
     private fun handleJobHeartbeat(packetMsg: IPacketMsg) {
-        JobID(packetMsg.getTargetJobID()).let(jobManager::heartbeatJob)
+        JobID(packetMsg.targetJobID).let(jobManager::heartbeatJob)
     }
 
     private fun handleJobFailed(packetMsg: IPacketMsg) {
-        JobID(packetMsg.getTargetJobID()).let(jobManager::failJob)
+        JobID(packetMsg.targetJobID).let(jobManager::failJob)
     }
 
     companion object {
diff --git a/src/main/java/in/dragonbra/javasteam/steam/steamclient/callbacks/DisconnectedCallback.kt b/src/main/java/in/dragonbra/javasteam/steam/steamclient/callbacks/DisconnectedCallback.kt
index 8dcb37b9..55488433 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/steamclient/callbacks/DisconnectedCallback.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/steamclient/callbacks/DisconnectedCallback.kt
@@ -1,5 +1,6 @@
 package `in`.dragonbra.javasteam.steam.steamclient.callbacks
 
+import `in`.dragonbra.javasteam.steam.CMClient
 import `in`.dragonbra.javasteam.steam.steamclient.callbackmgr.CallbackMsg
 
 /**
diff --git a/src/main/java/in/dragonbra/javasteam/steam/webapi/WebAPI.java b/src/main/java/in/dragonbra/javasteam/steam/webapi/WebAPI.java
index 54a936b1..350e365b 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/webapi/WebAPI.java
+++ b/src/main/java/in/dragonbra/javasteam/steam/webapi/WebAPI.java
@@ -7,7 +7,6 @@
 import okhttp3.*;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/in/dragonbra/javasteam/types/KVTextReader.kt b/src/main/java/in/dragonbra/javasteam/types/KVTextReader.kt
index b56db0bb..a27afc72 100644
--- a/src/main/java/in/dragonbra/javasteam/types/KVTextReader.kt
+++ b/src/main/java/in/dragonbra/javasteam/types/KVTextReader.kt
@@ -54,8 +54,8 @@ internal constructor(
         }
 
     init {
-        val wasQuoted = Passable<Boolean>(false)
-        val wasConditional = Passable<Boolean>(false)
+        val wasQuoted = Passable(false)
+        val wasConditional = Passable(false)
 
         var currentKey: KeyValue? = kv
 
@@ -175,7 +175,7 @@ internal constructor(
                     read()
 
                     val escapedChar = read().toChar()
-                    var replacedChar = ESCAPED_MAPPING[escapedChar] ?: escapedChar
+                    val replacedChar = ESCAPED_MAPPING[escapedChar] ?: escapedChar
 
                     sb.append(replacedChar)
 
diff --git a/src/main/java/in/dragonbra/javasteam/types/KeyValue.kt b/src/main/java/in/dragonbra/javasteam/types/KeyValue.kt
index 2a05e285..1ef8e093 100644
--- a/src/main/java/in/dragonbra/javasteam/types/KeyValue.kt
+++ b/src/main/java/in/dragonbra/javasteam/types/KeyValue.kt
@@ -570,6 +570,7 @@ class KeyValue @JvmOverloads constructor(
                     }
 
                     Type.STRING -> localCurrent.value = input.readNullTermString(StandardCharsets.UTF_8)
+
                     Type.WIDESTRING -> {
                         logger.debug("Encountered WideString type when parsing binary KeyValue, which is unsupported. Returning false.")
                         return false
@@ -581,8 +582,11 @@ class KeyValue @JvmOverloads constructor(
                     -> localCurrent.value = input.readInt().toString()
 
                     Type.UINT64 -> localCurrent.value = input.readLong().toString()
+
                     Type.FLOAT32 -> localCurrent.value = input.readFloat().toString()
+
                     Type.INT64 -> localCurrent.value = input.readLong().toString()
+
                     else -> return false
                 }
 
diff --git a/src/main/java/in/dragonbra/javasteam/types/MessageObject.kt b/src/main/java/in/dragonbra/javasteam/types/MessageObject.kt
index a656ebc3..34b6d407 100644
--- a/src/main/java/in/dragonbra/javasteam/types/MessageObject.kt
+++ b/src/main/java/in/dragonbra/javasteam/types/MessageObject.kt
@@ -9,6 +9,7 @@ import java.io.OutputStream
  * @constructor Initializes a new instance of the [MessageObject] class, using the provided KeyValues object.
  * @param keyValues The KeyValue backing store for this message object.
  */
+@Suppress("unused")
 open class MessageObject @JvmOverloads constructor(
     protected var keyValues: KeyValue = KeyValue("MessageObject"),
 ) {
diff --git a/src/main/java/in/dragonbra/javasteam/types/SteamID.kt b/src/main/java/in/dragonbra/javasteam/types/SteamID.kt
index 727223f2..efc565a2 100644
--- a/src/main/java/in/dragonbra/javasteam/types/SteamID.kt
+++ b/src/main/java/in/dragonbra/javasteam/types/SteamID.kt
@@ -236,6 +236,7 @@ class SteamID {
             }
 
             UNKNOWN_ACCOUNT_TYPE_CHAR -> accountType = EAccountType.Invalid
+
             else -> accountType = CollectionUtils.getKeyByValue(ACCOUNT_TYPE_CHARS, type)
         }
 
diff --git a/src/main/java/in/dragonbra/javasteam/util/NetHelpers.kt b/src/main/java/in/dragonbra/javasteam/util/NetHelpers.kt
index 7ebe888c..21a4bc99 100644
--- a/src/main/java/in/dragonbra/javasteam/util/NetHelpers.kt
+++ b/src/main/java/in/dragonbra/javasteam/util/NetHelpers.kt
@@ -103,7 +103,7 @@ object NetHelpers {
                 return null
             }
 
-            var ip = stringValue.substring(0, split)
+            var ip = stringValue.take(split)
             val port = stringValue.substring(split + 1).toIntOrNull() ?: return null
 
             if (ip.startsWith("[") && ip.endsWith("]")) {
diff --git a/src/main/java/in/dragonbra/javasteam/util/compat/InputStreamCompat.kt b/src/main/java/in/dragonbra/javasteam/util/compat/InputStreamCompat.kt
index 5f9ff54a..40a85ce3 100644
--- a/src/main/java/in/dragonbra/javasteam/util/compat/InputStreamCompat.kt
+++ b/src/main/java/in/dragonbra/javasteam/util/compat/InputStreamCompat.kt
@@ -42,7 +42,7 @@ fun InputStream.readNBytesCompat(len: Int): ByteArray {
     var n: Int
 
     do {
-        var buf = ByteArray(min(remaining, 8192))
+        val buf = ByteArray(min(remaining, 8192))
         var nread = 0
 
         // read to EOF which may read more or less than buffer size
@@ -82,7 +82,7 @@ fun InputStream.readNBytesCompat(len: Int): ByteArray {
     remaining = total
 
     bufs.forEach { b ->
-        var count = min(b.size, remaining)
+        val count = min(b.size, remaining)
         System.arraycopy(b, 0, result, offset, count)
         offset += count
         remaining -= count
diff --git a/src/main/java/in/dragonbra/javasteam/util/log/LogManager.kt b/src/main/java/in/dragonbra/javasteam/util/log/LogManager.kt
index 9b636394..22b550d4 100644
--- a/src/main/java/in/dragonbra/javasteam/util/log/LogManager.kt
+++ b/src/main/java/in/dragonbra/javasteam/util/log/LogManager.kt
@@ -7,6 +7,7 @@ import java.util.*
  * @author lngtr
  * @since 2018-03-02
  */
+@Suppress("unused")
 object LogManager {
 
     private val LOGGERS: MutableMap<Class<*>, Logger> = HashMap<Class<*>, Logger>()
diff --git a/src/main/java/in/dragonbra/javasteam/util/stream/MemoryStream.java b/src/main/java/in/dragonbra/javasteam/util/stream/MemoryStream.java
index 52cda7f8..abb3ee4c 100644
--- a/src/main/java/in/dragonbra/javasteam/util/stream/MemoryStream.java
+++ b/src/main/java/in/dragonbra/javasteam/util/stream/MemoryStream.java
@@ -173,8 +173,10 @@ public synchronized int read() {
 
     @Override
     public synchronized int read(byte[] b, int off, int len) {
-        if (position >= length || len == 0)
+        if (len == 0)
             return 0;
+        if (position >= length)
+            return -1;
 
         if (position > length - len)
             len = length - position;
diff --git a/src/main/steamd/in/dragonbra/javasteam/enums.steamd b/src/main/steamd/in/dragonbra/javasteam/enums.steamd
index 7c2b2ed2..2a02fb74 100644
--- a/src/main/steamd/in/dragonbra/javasteam/enums.steamd
+++ b/src/main/steamd/in/dragonbra/javasteam/enums.steamd
@@ -89,7 +89,8 @@ enum EAccountFlags flags
 	LimitedUser = 4096;
 	LimitedUserForce = 8192;
 	EmailValidated = 16384;
-	MarketingTreatment = 32768;
+	ValveEmail = 32768;
+	MarketingTreatment = 32768; removed
 	OGGInviteOptOut = 65536;
 	ForcePasswordChange = 131072;
 	ForceEmailVerification = 262144;
@@ -705,6 +706,13 @@ enum EPlatformType
 	OSX = 4;
 	PS3 = 5;
 	Linux32 = 6;
+	Android32 = 7;
+	Android64 = 8;
+	IOS32 = 9;
+	IOS64 = 10;
+	TVOS = 11;
+	EmbeddedClient = 12;
+	Browser = 13;
 };
 
 enum EOSType
@@ -930,7 +938,7 @@ enum EServerType
 	Steam2Emulator = 79;
 	PublicTest = 80;
 	SolrMgr = 81;
-	BroadcastIngestor = 82;
+	BroadcastIngester = 82;
 	BroadcastDirectory = 83;
 	VideoManager = 84;
 	TradeOffer = 85;
@@ -1178,7 +1186,7 @@ enum EEconTradeResponse
 	CyberCafeInitiator = 14;
 	CyberCafeTarget = 15;
 	SchoolLabInitiator = 16;
-	SchoolLabTarget = 16;
+	SchoolLabTarget = 17;
 	InitiatorBlockedTarget = 18;
 	InitiatorNeedsVerifiedEmail = 20;
 	InitiatorNeedsSteamGuard = 21;
@@ -1417,7 +1425,7 @@ enum EDisplayStatus
 	PresaleOnly = 13;
 	InvalidPlatform = 14;
 	ParentalBlocked = 15;
-	PreloadOnly = 16;
+	PreloadComplete = 16;
 	BorrowerLocked = 17;
 	UpdatePaused = 18;
 	UpdateQueued = 19;
@@ -1438,6 +1446,9 @@ enum EDisplayStatus
 	CloudError = 34;
 	CloudOutOfDate = 35;
 	Terminating = 36;
+	OwnerLocked = 37;
+	DownloadFailed = 38;
+	UpdateFailed = 39;
 };
 
 enum EAppType flags
@@ -1562,10 +1573,11 @@ enum EVoiceCallState
 	LocalMicOnly = 3;
 	CreatePeerConnection = 4;
 	InitatedWebRTCSession = 5;
-	WebRTCConnectedWaitingOnIceConnected = 6;
-	RequestedPermission = 7;
-	NotifyingVoiceChatOfWebRTCSession = 8;
-	Connected = 9;
+	UpdatingWebRTCSession = 6;
+	WebRTCConnectedWaitingOnIceConnected = 7;
+	RequestedPermission = 8;
+	NotifyingVoiceChatOfWebRTCSession = 9;
+	Connected = 10;
 };
 
 enum ETradeOfferState
@@ -1581,6 +1593,7 @@ enum ETradeOfferState
 	CreatedNeedsConfirmation = 9;
 	CanceledBySecondFactor = 10;
 	InEscrow = 11;
+	Reverted = 12;
 };
 
 enum ETradeOfferConfirmationMethod
@@ -1668,9 +1681,10 @@ public enum EUIMode
 	Tenfoot = 1;
 	Mobile = 2;
 	Web = 3;
-	ClientUI = 4;
+	GamePadUI = 4;
 	MobileChat = 5;
 	EmbeddedClient = 6;
+	DesktopUI = 7;
 }
 
 public enum EGamingDeviceType
@@ -1678,14 +1692,62 @@ public enum EGamingDeviceType
 	Unknown = 0;
 	StandardPC = 1;
 
-	Console = 256;
-	PS3 = 272; // Console + 16
-	Steambox = 288; // Console + 32
-	Tesla = 320; // Console + 64
+	ConsoleLegacy = 256;
+	PS3 = 273; // ConsoleLegacy + 17
+	Steambox = 288; // ConsoleLegacy + 32
+	Tesla = 320; // ConsoleLegacy + 64
+
+	Handheld_Legacy = 512;
+	Phone = 528; // Handheld_Legacy + 16
+	Console = 540; // Handheld_Legacy + 28
+	SteamOSGeneric = 541; // Console + 1
+	SteamDeck = 544; // Console + 4
+	LegionGoS = 545; // Console + 5
+	Fremont = 546; // Console + 6
+
+	VR = 768;
+	SteamFrame = 769; // VR + 1
+}
+
+public enum EMobileConfirmationAction
+{
+	None = 0;
+	Allow = 1;
+	Cancel = 2;
+}
+
+public enum EMobileConfirmationType
+{
+	Invalid = 0;
+	Test = 1;
+	Trade = 2;
+	MarketListing = 3;
+	FeatureOptOut = 4;
+	PhoneNumberChange = 5;
+	AccountRecovery = 6;
+	BuildChangeRequest = 7;
+	AddUser = 8;
+	RegisterApiKey = 9;
+	InviteToFamilyGroup = 10;
+	JoinFamilyGroup = 11;
+	MarketPurchase = 12;
+	RequestRefund = 13;
+}
+
+public enum ECommentPermission
+{
+    Invalid = -1;
+
+    FriendsOnly = 0;
+    Anyone = 1;
+    SelfOnly = 2;
+}
+
+public enum ECommunityPrivacy
+{
+    Invalid = 0;
 
-	Handheld = 512;
-	Phone = 528; // Handheld + 16
-	SteamOS = 541; // Handheld + 29
-	SteamDeck = 544; // Handheld + 32
-	LegionGoS = 545; // Handheld + 33
+    Private = 1;
+    FriendsOnly = 2;
+    Public = 3;
 }
diff --git a/src/main/steamd/in/dragonbra/javasteam/eresult.steamd b/src/main/steamd/in/dragonbra/javasteam/eresult.steamd
index a9ab0fd3..9981c7f8 100644
--- a/src/main/steamd/in/dragonbra/javasteam/eresult.steamd
+++ b/src/main/steamd/in/dragonbra/javasteam/eresult.steamd
@@ -130,4 +130,6 @@ enum EResult
 	PhoneNumberIsVOIP = 127;
 	NotSupported = 128;
 	FamilySizeLimitExceeded = 129;
+	OfflineAppCacheInvalid = 130;
+	TryLater = 131;
 };