diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index 6963493b..8ebca6f9 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -65,6 +65,8 @@ struct FFXIVIpcEventHandlerReturn : FFXIVIpcBasePacket< ReturnEventHandler >
    /* 0008 */ uint16_t param2;
    /* 000A */ char pad_000A[2];
    /* 000C */ uint16_t param3;
+   /* 000E */ char pad_000E[2];
+   /* 0010 */ uint16_t tradeQuantity;
 };
 
 struct FFXIVIpcEnterTerritoryHandler : FFXIVIpcBasePacket< EnterTeriEventHandler >
diff --git a/src/servers/Scripts/common/GilShop.cpp b/src/servers/Scripts/common/GilShop.cpp
index c72256fe..bcf67844 100644
--- a/src/servers/Scripts/common/GilShop.cpp
+++ b/src/servers/Scripts/common/GilShop.cpp
@@ -7,13 +7,33 @@ public:
    GilShop() : EventScript( 0x00041 )
    {}
 
+   constexpr static auto SCENE_FLAGS = HIDE_HOTBAR | NO_DEFAULT_CAMERA;
+
+   static void shopInteractionCallback( Entity::Player& player, const Event::SceneResult& result )
+   {
+      // item purchase
+      if( result.param1 == 768 )
+      {
+         //player.playGilShop( result.eventId, HIDE_HOTBAR | NO_DEFAULT_CAMERA, shopInteractionCallback );
+
+         player.sendDebug("got tradeQuantity: " + std::to_string( result.tradeQuantity ) );
+         player.playScene( result.eventId, 10, SCENE_FLAGS, 0, 0, shopInteractionCallback );
+         return;
+      }
+
+      // exit
+      player.playScene( result.eventId, 255, SCENE_FLAGS );
+   }
+
+   static void shopCallback( Entity::Player& player, const Event::SceneResult& result )
+   {
+      //player.playGilShop( result.eventId, HIDE_HOTBAR | NO_DEFAULT_CAMERA, shopInteractionCallback );
+
+      player.playScene( result.eventId, 10, SCENE_FLAGS, 0, 0, shopInteractionCallback );
+   }
+
    void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
    {
-      auto callback = [actorId]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         player.playGilShop( actorId, result.eventId, HIDE_HOTBAR | NO_DEFAULT_CAMERA );
-      };
-
-      player.playScene( eventId, 0, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 0, 2, callback );
+      player.playScene( eventId, 0, SCENE_FLAGS, 0, 2, shopCallback );
    }
 };
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 276610c2..1ea9aec1 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -58,7 +58,8 @@ public:
    /*! play a subevent */
    void playScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam2, uint32_t eventParam3 );
 
-   void playGilShop( uint64_t actorId, uint32_t eventId, uint32_t flags );
+   void playGilShop( uint32_t eventId, uint32_t flags,
+                     Event::EventHandler::SceneReturnCallback eventCallback );
 
    void directorPlayScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam3, uint32_t eventParam4, uint32_t eventParam5 = 0 );
 
diff --git a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
index 1d877b10..d8cbf1f7 100644
--- a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
@@ -133,20 +133,19 @@ void Core::Entity::Player::playScene( uint32_t eventId, uint32_t scene,
    playScene( eventId, scene, flags, eventParam2, eventParam3, 0, eventCallback );
 }
 
-void Core::Entity::Player::playGilShop( uint64_t actorId, uint32_t eventId, uint32_t flags )
+void Core::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags,
+                                        Event::EventHandler::SceneReturnCallback eventCallback )
 {
-   auto pEvent = getEvent( eventId );
+   auto pEvent = bootstrapSceneEvent( eventId, flags );
    if( !pEvent )
-   {
-      auto pLog = g_fw.get< Logger >();
-      pLog->error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
       return;
-   }
+
+   pEvent->setEventReturnCallback( eventCallback );
 
    auto openGilShopPacket = makeZonePacket< Server::FFXIVIpcEventOpenGilShop >( getId() );
    openGilShopPacket->data().eventId = eventId;
    openGilShopPacket->data().sceneFlags = flags;
-   openGilShopPacket->data().actorId = actorId;
+   openGilShopPacket->data().actorId = getId();
 
    openGilShopPacket->data().scene = 10;
 
diff --git a/src/servers/sapphire_zone/Event/EventHandler.h b/src/servers/sapphire_zone/Event/EventHandler.h
index 87a29c8d..c6e94105 100644
--- a/src/servers/sapphire_zone/Event/EventHandler.h
+++ b/src/servers/sapphire_zone/Event/EventHandler.h
@@ -12,6 +12,7 @@ namespace Core {
          uint16_t param1;
          uint16_t param2;
          uint16_t param3;
+         uint16_t tradeQuantity;
       };
 
       class EventHandler
diff --git a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
index 801ab2b7..27a165bd 100644
--- a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
@@ -203,6 +203,7 @@ void Core::Network::GameConnection::eventHandlerReturn( const Packets::FFXIVARR_
    const auto& param1 = packet.data().param1;
    const auto& param2 = packet.data().param2;
    const auto& param3 = packet.data().param3;
+   const auto& tradeQuantity = packet.data().tradeQuantity;
 
    std::string eventName = Event::getEventName( eventId );
 
@@ -228,6 +229,7 @@ void Core::Network::GameConnection::eventHandlerReturn( const Packets::FFXIVARR_
          result.param1 = param1;
          result.param2 = param2;
          result.param3 = param3;
+         result.tradeQuantity = tradeQuantity;
          eventCallback( player, result );
       }
       // we might have a scene chain callback instead so check for that too