diff --git a/core/gen/com/riiablo/net/packet/d2gs/BeltToCursor.java b/core/gen/com/riiablo/net/packet/d2gs/BeltToCursor.java
new file mode 100644
index 00000000..3fa08779
--- /dev/null
+++ b/core/gen/com/riiablo/net/packet/d2gs/BeltToCursor.java
@@ -0,0 +1,34 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+package com.riiablo.net.packet.d2gs;
+
+import com.google.flatbuffers.FlatBufferBuilder;
+import com.google.flatbuffers.Table;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+@SuppressWarnings("unused")
+public final class BeltToCursor extends Table {
+  public static BeltToCursor getRootAsBeltToCursor(ByteBuffer _bb) { return getRootAsBeltToCursor(_bb, new BeltToCursor()); }
+  public static BeltToCursor getRootAsBeltToCursor(ByteBuffer _bb, BeltToCursor obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
+  public void __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; vtable_start = bb_pos - bb.getInt(bb_pos); vtable_size = bb.getShort(vtable_start); }
+  public BeltToCursor __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }
+
+  public int itemId() { int o = __offset(4); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
+
+  public static int createBeltToCursor(FlatBufferBuilder builder,
+      int itemId) {
+    builder.startObject(1);
+    BeltToCursor.addItemId(builder, itemId);
+    return BeltToCursor.endBeltToCursor(builder);
+  }
+
+  public static void startBeltToCursor(FlatBufferBuilder builder) { builder.startObject(1); }
+  public static void addItemId(FlatBufferBuilder builder, int itemId) { builder.addInt(0, itemId, 0); }
+  public static int endBeltToCursor(FlatBufferBuilder builder) {
+    int o = builder.endObject();
+    return o;
+  }
+}
+
diff --git a/core/gen/com/riiablo/net/packet/d2gs/BodyToCursor.java b/core/gen/com/riiablo/net/packet/d2gs/BodyToCursor.java
new file mode 100644
index 00000000..94696330
--- /dev/null
+++ b/core/gen/com/riiablo/net/packet/d2gs/BodyToCursor.java
@@ -0,0 +1,37 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+package com.riiablo.net.packet.d2gs;
+
+import java.nio.*;
+import java.lang.*;
+import java.util.*;
+import com.google.flatbuffers.*;
+
+@SuppressWarnings("unused")
+public final class BodyToCursor extends Table {
+  public static BodyToCursor getRootAsBodyToCursor(ByteBuffer _bb) { return getRootAsBodyToCursor(_bb, new BodyToCursor()); }
+  public static BodyToCursor getRootAsBodyToCursor(ByteBuffer _bb, BodyToCursor obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
+  public void __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; vtable_start = bb_pos - bb.getInt(bb_pos); vtable_size = bb.getShort(vtable_start); }
+  public BodyToCursor __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }
+
+  public int bodyLoc() { int o = __offset(4); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
+  public boolean merc() { int o = __offset(6); return o != 0 ? 0!=bb.get(o + bb_pos) : false; }
+
+  public static int createBodyToCursor(FlatBufferBuilder builder,
+      int bodyLoc,
+      boolean merc) {
+    builder.startObject(2);
+    BodyToCursor.addBodyLoc(builder, bodyLoc);
+    BodyToCursor.addMerc(builder, merc);
+    return BodyToCursor.endBodyToCursor(builder);
+  }
+
+  public static void startBodyToCursor(FlatBufferBuilder builder) { builder.startObject(2); }
+  public static void addBodyLoc(FlatBufferBuilder builder, int bodyLoc) { builder.addInt(0, bodyLoc, 0); }
+  public static void addMerc(FlatBufferBuilder builder, boolean merc) { builder.addBoolean(1, merc, false); }
+  public static int endBodyToCursor(FlatBufferBuilder builder) {
+    int o = builder.endObject();
+    return o;
+  }
+}
+
diff --git a/core/gen/com/riiablo/net/packet/d2gs/CursorToBelt.java b/core/gen/com/riiablo/net/packet/d2gs/CursorToBelt.java
new file mode 100644
index 00000000..9538d949
--- /dev/null
+++ b/core/gen/com/riiablo/net/packet/d2gs/CursorToBelt.java
@@ -0,0 +1,37 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+package com.riiablo.net.packet.d2gs;
+
+import java.nio.*;
+import java.lang.*;
+import java.util.*;
+import com.google.flatbuffers.*;
+
+@SuppressWarnings("unused")
+public final class CursorToBelt extends Table {
+  public static CursorToBelt getRootAsCursorToBelt(ByteBuffer _bb) { return getRootAsCursorToBelt(_bb, new CursorToBelt()); }
+  public static CursorToBelt getRootAsCursorToBelt(ByteBuffer _bb, CursorToBelt obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
+  public void __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; vtable_start = bb_pos - bb.getInt(bb_pos); vtable_size = bb.getShort(vtable_start); }
+  public CursorToBelt __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }
+
+  public int x() { int o = __offset(4); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
+  public int y() { int o = __offset(6); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
+
+  public static int createCursorToBelt(FlatBufferBuilder builder,
+      int x,
+      int y) {
+    builder.startObject(2);
+    CursorToBelt.addY(builder, y);
+    CursorToBelt.addX(builder, x);
+    return CursorToBelt.endCursorToBelt(builder);
+  }
+
+  public static void startCursorToBelt(FlatBufferBuilder builder) { builder.startObject(2); }
+  public static void addX(FlatBufferBuilder builder, int x) { builder.addInt(0, x, 0); }
+  public static void addY(FlatBufferBuilder builder, int y) { builder.addInt(1, y, 0); }
+  public static int endCursorToBelt(FlatBufferBuilder builder) {
+    int o = builder.endObject();
+    return o;
+  }
+}
+
diff --git a/core/gen/com/riiablo/net/packet/d2gs/CursorToBody.java b/core/gen/com/riiablo/net/packet/d2gs/CursorToBody.java
new file mode 100644
index 00000000..a3de5f82
--- /dev/null
+++ b/core/gen/com/riiablo/net/packet/d2gs/CursorToBody.java
@@ -0,0 +1,37 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+package com.riiablo.net.packet.d2gs;
+
+import java.nio.*;
+import java.lang.*;
+import java.util.*;
+import com.google.flatbuffers.*;
+
+@SuppressWarnings("unused")
+public final class CursorToBody extends Table {
+  public static CursorToBody getRootAsCursorToBody(ByteBuffer _bb) { return getRootAsCursorToBody(_bb, new CursorToBody()); }
+  public static CursorToBody getRootAsCursorToBody(ByteBuffer _bb, CursorToBody obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
+  public void __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; vtable_start = bb_pos - bb.getInt(bb_pos); vtable_size = bb.getShort(vtable_start); }
+  public CursorToBody __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }
+
+  public int bodyLoc() { int o = __offset(4); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
+  public boolean merc() { int o = __offset(6); return o != 0 ? 0!=bb.get(o + bb_pos) : false; }
+
+  public static int createCursorToBody(FlatBufferBuilder builder,
+      int bodyLoc,
+      boolean merc) {
+    builder.startObject(2);
+    CursorToBody.addBodyLoc(builder, bodyLoc);
+    CursorToBody.addMerc(builder, merc);
+    return CursorToBody.endCursorToBody(builder);
+  }
+
+  public static void startCursorToBody(FlatBufferBuilder builder) { builder.startObject(2); }
+  public static void addBodyLoc(FlatBufferBuilder builder, int bodyLoc) { builder.addInt(0, bodyLoc, 0); }
+  public static void addMerc(FlatBufferBuilder builder, boolean merc) { builder.addBoolean(1, merc, false); }
+  public static int endCursorToBody(FlatBufferBuilder builder) {
+    int o = builder.endObject();
+    return o;
+  }
+}
+
diff --git a/core/gen/com/riiablo/net/packet/d2gs/CursorToGround.java b/core/gen/com/riiablo/net/packet/d2gs/CursorToGround.java
new file mode 100644
index 00000000..57b1f7eb
--- /dev/null
+++ b/core/gen/com/riiablo/net/packet/d2gs/CursorToGround.java
@@ -0,0 +1,24 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+package com.riiablo.net.packet.d2gs;
+
+import java.nio.*;
+import java.lang.*;
+import java.util.*;
+import com.google.flatbuffers.*;
+
+@SuppressWarnings("unused")
+public final class CursorToGround extends Table {
+  public static CursorToGround getRootAsCursorToGround(ByteBuffer _bb) { return getRootAsCursorToGround(_bb, new CursorToGround()); }
+  public static CursorToGround getRootAsCursorToGround(ByteBuffer _bb, CursorToGround obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
+  public void __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; vtable_start = bb_pos - bb.getInt(bb_pos); vtable_size = bb.getShort(vtable_start); }
+  public CursorToGround __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }
+
+
+  public static void startCursorToGround(FlatBufferBuilder builder) { builder.startObject(0); }
+  public static int endCursorToGround(FlatBufferBuilder builder) {
+    int o = builder.endObject();
+    return o;
+  }
+}
+
diff --git a/core/gen/com/riiablo/net/packet/d2gs/CursorToStore.java b/core/gen/com/riiablo/net/packet/d2gs/CursorToStore.java
new file mode 100644
index 00000000..04fd08ac
--- /dev/null
+++ b/core/gen/com/riiablo/net/packet/d2gs/CursorToStore.java
@@ -0,0 +1,41 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+package com.riiablo.net.packet.d2gs;
+
+import java.nio.*;
+import java.lang.*;
+import java.util.*;
+import com.google.flatbuffers.*;
+
+@SuppressWarnings("unused")
+public final class CursorToStore extends Table {
+  public static CursorToStore getRootAsCursorToStore(ByteBuffer _bb) { return getRootAsCursorToStore(_bb, new CursorToStore()); }
+  public static CursorToStore getRootAsCursorToStore(ByteBuffer _bb, CursorToStore obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
+  public void __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; vtable_start = bb_pos - bb.getInt(bb_pos); vtable_size = bb.getShort(vtable_start); }
+  public CursorToStore __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }
+
+  public int storeLoc() { int o = __offset(4); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
+  public int x() { int o = __offset(6); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
+  public int y() { int o = __offset(8); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
+
+  public static int createCursorToStore(FlatBufferBuilder builder,
+      int storeLoc,
+      int x,
+      int y) {
+    builder.startObject(3);
+    CursorToStore.addY(builder, y);
+    CursorToStore.addX(builder, x);
+    CursorToStore.addStoreLoc(builder, storeLoc);
+    return CursorToStore.endCursorToStore(builder);
+  }
+
+  public static void startCursorToStore(FlatBufferBuilder builder) { builder.startObject(3); }
+  public static void addStoreLoc(FlatBufferBuilder builder, int storeLoc) { builder.addInt(0, storeLoc, 0); }
+  public static void addX(FlatBufferBuilder builder, int x) { builder.addInt(1, x, 0); }
+  public static void addY(FlatBufferBuilder builder, int y) { builder.addInt(2, y, 0); }
+  public static int endCursorToStore(FlatBufferBuilder builder) {
+    int o = builder.endObject();
+    return o;
+  }
+}
+
diff --git a/core/gen/com/riiablo/net/packet/d2gs/D2GSData.java b/core/gen/com/riiablo/net/packet/d2gs/D2GSData.java
index f00e1466..5a94eb4e 100644
--- a/core/gen/com/riiablo/net/packet/d2gs/D2GSData.java
+++ b/core/gen/com/riiablo/net/packet/d2gs/D2GSData.java
@@ -14,8 +14,19 @@ public final class D2GSData {
   public static final byte Disconnect = 7;
   public static final byte DropItem = 8;
   public static final byte PickupItem = 9;
+  public static final byte GroundToCursor = 10;
+  public static final byte CursorToGround = 11;
+  public static final byte StoreToCursor = 12;
+  public static final byte CursorToStore = 13;
+  public static final byte SwapStoreItem = 14;
+  public static final byte BodyToCursor = 15;
+  public static final byte CursorToBody = 16;
+  public static final byte SwapBodyItem = 17;
+  public static final byte BeltToCursor = 18;
+  public static final byte CursorToBelt = 19;
+  public static final byte SwapBeltItem = 20;
 
-  public static final String[] names = { "NONE", "WalkToLocation", "WalkToEntity", "RunToLocation", "RunToEntity", "Connection", "EntitySync", "Disconnect", "DropItem", "PickupItem", };
+  public static final String[] names = { "NONE", "WalkToLocation", "WalkToEntity", "RunToLocation", "RunToEntity", "Connection", "EntitySync", "Disconnect", "DropItem", "PickupItem", "GroundToCursor", "CursorToGround", "StoreToCursor", "CursorToStore", "SwapStoreItem", "BodyToCursor", "CursorToBody", "SwapBodyItem", "BeltToCursor", "CursorToBelt", "SwapBeltItem", };
 
   public static String name(int e) { return names[e]; }
 }
diff --git a/core/gen/com/riiablo/net/packet/d2gs/GroundToCursor.java b/core/gen/com/riiablo/net/packet/d2gs/GroundToCursor.java
new file mode 100644
index 00000000..6f696404
--- /dev/null
+++ b/core/gen/com/riiablo/net/packet/d2gs/GroundToCursor.java
@@ -0,0 +1,33 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+package com.riiablo.net.packet.d2gs;
+
+import java.nio.*;
+import java.lang.*;
+import java.util.*;
+import com.google.flatbuffers.*;
+
+@SuppressWarnings("unused")
+public final class GroundToCursor extends Table {
+  public static GroundToCursor getRootAsGroundToCursor(ByteBuffer _bb) { return getRootAsGroundToCursor(_bb, new GroundToCursor()); }
+  public static GroundToCursor getRootAsGroundToCursor(ByteBuffer _bb, GroundToCursor obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
+  public void __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; vtable_start = bb_pos - bb.getInt(bb_pos); vtable_size = bb.getShort(vtable_start); }
+  public GroundToCursor __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }
+
+  public int itemId() { int o = __offset(4); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
+
+  public static int createGroundToCursor(FlatBufferBuilder builder,
+      int itemId) {
+    builder.startObject(1);
+    GroundToCursor.addItemId(builder, itemId);
+    return GroundToCursor.endGroundToCursor(builder);
+  }
+
+  public static void startGroundToCursor(FlatBufferBuilder builder) { builder.startObject(1); }
+  public static void addItemId(FlatBufferBuilder builder, int itemId) { builder.addInt(0, itemId, 0); }
+  public static int endGroundToCursor(FlatBufferBuilder builder) {
+    int o = builder.endObject();
+    return o;
+  }
+}
+
diff --git a/core/gen/com/riiablo/net/packet/d2gs/StoreToCursor.java b/core/gen/com/riiablo/net/packet/d2gs/StoreToCursor.java
new file mode 100644
index 00000000..03e9a357
--- /dev/null
+++ b/core/gen/com/riiablo/net/packet/d2gs/StoreToCursor.java
@@ -0,0 +1,33 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+package com.riiablo.net.packet.d2gs;
+
+import java.nio.*;
+import java.lang.*;
+import java.util.*;
+import com.google.flatbuffers.*;
+
+@SuppressWarnings("unused")
+public final class StoreToCursor extends Table {
+  public static StoreToCursor getRootAsStoreToCursor(ByteBuffer _bb) { return getRootAsStoreToCursor(_bb, new StoreToCursor()); }
+  public static StoreToCursor getRootAsStoreToCursor(ByteBuffer _bb, StoreToCursor obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
+  public void __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; vtable_start = bb_pos - bb.getInt(bb_pos); vtable_size = bb.getShort(vtable_start); }
+  public StoreToCursor __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }
+
+  public int itemId() { int o = __offset(4); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
+
+  public static int createStoreToCursor(FlatBufferBuilder builder,
+      int itemId) {
+    builder.startObject(1);
+    StoreToCursor.addItemId(builder, itemId);
+    return StoreToCursor.endStoreToCursor(builder);
+  }
+
+  public static void startStoreToCursor(FlatBufferBuilder builder) { builder.startObject(1); }
+  public static void addItemId(FlatBufferBuilder builder, int itemId) { builder.addInt(0, itemId, 0); }
+  public static int endStoreToCursor(FlatBufferBuilder builder) {
+    int o = builder.endObject();
+    return o;
+  }
+}
+
diff --git a/core/gen/com/riiablo/net/packet/d2gs/SwapBeltItem.java b/core/gen/com/riiablo/net/packet/d2gs/SwapBeltItem.java
new file mode 100644
index 00000000..f8f2df91
--- /dev/null
+++ b/core/gen/com/riiablo/net/packet/d2gs/SwapBeltItem.java
@@ -0,0 +1,33 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+package com.riiablo.net.packet.d2gs;
+
+import java.nio.*;
+import java.lang.*;
+import java.util.*;
+import com.google.flatbuffers.*;
+
+@SuppressWarnings("unused")
+public final class SwapBeltItem extends Table {
+  public static SwapBeltItem getRootAsSwapBeltItem(ByteBuffer _bb) { return getRootAsSwapBeltItem(_bb, new SwapBeltItem()); }
+  public static SwapBeltItem getRootAsSwapBeltItem(ByteBuffer _bb, SwapBeltItem obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
+  public void __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; vtable_start = bb_pos - bb.getInt(bb_pos); vtable_size = bb.getShort(vtable_start); }
+  public SwapBeltItem __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }
+
+  public int itemId() { int o = __offset(4); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
+
+  public static int createSwapBeltItem(FlatBufferBuilder builder,
+      int itemId) {
+    builder.startObject(1);
+    SwapBeltItem.addItemId(builder, itemId);
+    return SwapBeltItem.endSwapBeltItem(builder);
+  }
+
+  public static void startSwapBeltItem(FlatBufferBuilder builder) { builder.startObject(1); }
+  public static void addItemId(FlatBufferBuilder builder, int itemId) { builder.addInt(0, itemId, 0); }
+  public static int endSwapBeltItem(FlatBufferBuilder builder) {
+    int o = builder.endObject();
+    return o;
+  }
+}
+
diff --git a/core/gen/com/riiablo/net/packet/d2gs/SwapBodyItem.java b/core/gen/com/riiablo/net/packet/d2gs/SwapBodyItem.java
new file mode 100644
index 00000000..26401a61
--- /dev/null
+++ b/core/gen/com/riiablo/net/packet/d2gs/SwapBodyItem.java
@@ -0,0 +1,37 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+package com.riiablo.net.packet.d2gs;
+
+import java.nio.*;
+import java.lang.*;
+import java.util.*;
+import com.google.flatbuffers.*;
+
+@SuppressWarnings("unused")
+public final class SwapBodyItem extends Table {
+  public static SwapBodyItem getRootAsSwapBodyItem(ByteBuffer _bb) { return getRootAsSwapBodyItem(_bb, new SwapBodyItem()); }
+  public static SwapBodyItem getRootAsSwapBodyItem(ByteBuffer _bb, SwapBodyItem obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
+  public void __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; vtable_start = bb_pos - bb.getInt(bb_pos); vtable_size = bb.getShort(vtable_start); }
+  public SwapBodyItem __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }
+
+  public int bodyLoc() { int o = __offset(4); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
+  public boolean merc() { int o = __offset(6); return o != 0 ? 0!=bb.get(o + bb_pos) : false; }
+
+  public static int createSwapBodyItem(FlatBufferBuilder builder,
+      int bodyLoc,
+      boolean merc) {
+    builder.startObject(2);
+    SwapBodyItem.addBodyLoc(builder, bodyLoc);
+    SwapBodyItem.addMerc(builder, merc);
+    return SwapBodyItem.endSwapBodyItem(builder);
+  }
+
+  public static void startSwapBodyItem(FlatBufferBuilder builder) { builder.startObject(2); }
+  public static void addBodyLoc(FlatBufferBuilder builder, int bodyLoc) { builder.addInt(0, bodyLoc, 0); }
+  public static void addMerc(FlatBufferBuilder builder, boolean merc) { builder.addBoolean(1, merc, false); }
+  public static int endSwapBodyItem(FlatBufferBuilder builder) {
+    int o = builder.endObject();
+    return o;
+  }
+}
+
diff --git a/core/gen/com/riiablo/net/packet/d2gs/SwapStoreItem.java b/core/gen/com/riiablo/net/packet/d2gs/SwapStoreItem.java
new file mode 100644
index 00000000..510e701e
--- /dev/null
+++ b/core/gen/com/riiablo/net/packet/d2gs/SwapStoreItem.java
@@ -0,0 +1,45 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+package com.riiablo.net.packet.d2gs;
+
+import java.nio.*;
+import java.lang.*;
+import java.util.*;
+import com.google.flatbuffers.*;
+
+@SuppressWarnings("unused")
+public final class SwapStoreItem extends Table {
+  public static SwapStoreItem getRootAsSwapStoreItem(ByteBuffer _bb) { return getRootAsSwapStoreItem(_bb, new SwapStoreItem()); }
+  public static SwapStoreItem getRootAsSwapStoreItem(ByteBuffer _bb, SwapStoreItem obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
+  public void __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; vtable_start = bb_pos - bb.getInt(bb_pos); vtable_size = bb.getShort(vtable_start); }
+  public SwapStoreItem __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }
+
+  public int itemId() { int o = __offset(4); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
+  public int storeLoc() { int o = __offset(6); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
+  public int x() { int o = __offset(8); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
+  public int y() { int o = __offset(10); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
+
+  public static int createSwapStoreItem(FlatBufferBuilder builder,
+      int itemId,
+      int storeLoc,
+      int x,
+      int y) {
+    builder.startObject(4);
+    SwapStoreItem.addY(builder, y);
+    SwapStoreItem.addX(builder, x);
+    SwapStoreItem.addStoreLoc(builder, storeLoc);
+    SwapStoreItem.addItemId(builder, itemId);
+    return SwapStoreItem.endSwapStoreItem(builder);
+  }
+
+  public static void startSwapStoreItem(FlatBufferBuilder builder) { builder.startObject(4); }
+  public static void addItemId(FlatBufferBuilder builder, int itemId) { builder.addInt(0, itemId, 0); }
+  public static void addStoreLoc(FlatBufferBuilder builder, int storeLoc) { builder.addInt(1, storeLoc, 0); }
+  public static void addX(FlatBufferBuilder builder, int x) { builder.addInt(2, x, 0); }
+  public static void addY(FlatBufferBuilder builder, int y) { builder.addInt(3, y, 0); }
+  public static int endSwapStoreItem(FlatBufferBuilder builder) {
+    int o = builder.endObject();
+    return o;
+  }
+}
+
diff --git a/core/src/com/riiablo/net/d2gs/D2GS.fbs b/core/src/com/riiablo/net/d2gs/D2GS.fbs
index 9cc0905b..662c2e09 100644
--- a/core/src/com/riiablo/net/d2gs/D2GS.fbs
+++ b/core/src/com/riiablo/net/d2gs/D2GS.fbs
@@ -7,6 +7,7 @@ include "Disconnect.fbs";
 include "Sync.fbs";
 include "DropItem.fbs";
 include "PickupItem.fbs";
+include "ItemManagement.fbs";
 
 namespace com.riiablo.net.packet.d2gs;
 
@@ -20,6 +21,17 @@ union D2GSData {
   Disconnect,
   DropItem,
   PickupItem,
+  GroundToCursor,
+  CursorToGround,
+  StoreToCursor,
+  CursorToStore,
+  SwapStoreItem,
+  BodyToCursor,
+  CursorToBody,
+  SwapBodyItem,
+  BeltToCursor,
+  CursorToBelt,
+  SwapBeltItem,
 }
 
 table D2GS {
diff --git a/core/src/com/riiablo/net/d2gs/ItemManagement.fbs b/core/src/com/riiablo/net/d2gs/ItemManagement.fbs
new file mode 100644
index 00000000..e8426c3e
--- /dev/null
+++ b/core/src/com/riiablo/net/d2gs/ItemManagement.fbs
@@ -0,0 +1,86 @@
+namespace com.riiablo.net.packet.d2gs;
+
+table GroundToCursor {
+  // request
+  itemId:int32;
+
+  // response
+}
+
+table CursorToGround {
+  // request
+
+  // response
+}
+
+table StoreToCursor {
+  // request
+  itemId:int32;
+
+  // response
+}
+
+table CursorToStore {
+  // request
+  storeLoc:int32;
+  x:int32;
+  y:int32;
+
+  // response
+}
+
+table SwapStoreItem {
+  // request
+  itemId:int32;
+  storeLoc:int32;
+  x:int32;
+  y:int32;
+
+  // response
+}
+
+table BodyToCursor {
+  // request
+  bodyLoc:int32;
+  merc:bool;
+
+  // response
+}
+
+table CursorToBody {
+  // request
+  bodyLoc:int32;
+  merc:bool;
+
+  // response
+}
+
+table SwapBodyItem {
+  // request
+  bodyLoc:int32;
+  merc:bool;
+
+  // response
+}
+
+table BeltToCursor {
+  // request
+  itemId:int32;
+
+  // response
+}
+
+table CursorToBelt {
+  // request
+  x:int32;
+  y:int32;
+
+  // response
+}
+
+table SwapBeltItem {
+  // request
+  itemId:int32;
+
+  // response
+}
\ No newline at end of file