diff --git a/src/servers/Server_Zone/Actor/Group/FriendList.cpp b/src/servers/Server_Zone/Actor/Group/FriendList.cpp
index 7d87a039..d08bc94b 100644
--- a/src/servers/Server_Zone/Actor/Group/FriendList.cpp
+++ b/src/servers/Server_Zone/Actor/Group/FriendList.cpp
@@ -28,10 +28,12 @@ std::vector< PlayerEntry > Core::Entity::Group::FriendList::getFriendListEntries
       entryList.push_back( generatePlayerEntry( member.second ) );
       limit++;
    }
+
+   return entryList;
 }
 
 //todo: make this function generic for all groups, and override if needed?
-ZoneChannelPacket< FFXIVIpcSocialList > Core::Entity::Group::FriendList::generateFriendsListPacket( PlayerPtr pPlayer )
+Core::Network::Packets::ZoneChannelPacket< FFXIVIpcSocialList > Core::Entity::Group::FriendList::generateFriendsListPacket( PlayerPtr pPlayer )
 {
    ZoneChannelPacket< FFXIVIpcSocialList > listPacket( pPlayer->getId() );
    listPacket.data().type = 0x0B;
@@ -48,4 +50,6 @@ ZoneChannelPacket< FFXIVIpcSocialList > Core::Entity::Group::FriendList::generat
       listPacket.data().entries[i] = generatePlayerEntry( member.second );
       i++;
    }
+
+   return listPacket;
 }
diff --git a/src/servers/Server_Zone/Actor/Group/FriendList.h b/src/servers/Server_Zone/Actor/Group/FriendList.h
index ba8aedd4..5b63b377 100644
--- a/src/servers/Server_Zone/Actor/Group/FriendList.h
+++ b/src/servers/Server_Zone/Actor/Group/FriendList.h
@@ -3,6 +3,7 @@
 
 #include <src/servers/Server_Common/Common.h>
 #include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Server_Common/Network/GamePacketNew.h>
 #include <Server_Common/Forwards.h>
 #include <Server_Zone/Actor/Group/Group.h>
 #include <Server_Zone/Forwards.h>
@@ -49,9 +50,11 @@ public:
    bool isBlacklist() const;
    bool isContentGroup() const;
 
+   Core::Network::Packets::ZoneChannelPacket< FFXIVIpcSocialList > generateFriendsListPacket( PlayerPtr pPlayer );
+
    std::vector< Core::Network::Packets::Server::PlayerEntry > getFriendListEntries( uint16_t entryAmount );
 
-   Core::Network::Packets::ZoneChannelPacket< FFXIVIpcSocialList > generateFriendsListPacket( PlayerPtr pPlayer );
+   
 
 private:
    GroupType m_type{ GroupType::FriendList };
diff --git a/src/servers/Server_Zone/Actor/Group/Group.cpp b/src/servers/Server_Zone/Actor/Group/Group.cpp
index 79ecb406..26cdd7e3 100644
--- a/src/servers/Server_Zone/Actor/Group/Group.cpp
+++ b/src/servers/Server_Zone/Actor/Group/Group.cpp
@@ -18,7 +18,7 @@ using namespace Core::Entity::Group;
 // todo: i fuckin have no fuckin clue how to use group manager classes, why not just have a map of <id, group>?
 // todo: invite map in g_serverZone.getGroupMgr(GroupType) and look up
 
-Core::Network::Packets::GamePacketPtr Group::addMember( PlayerPtr pSender, PlayerPtr pRecipient, uint64_t senderId, uint64_t recipientId )
+Core::Network::Packets::GamePacketPtr Group::addMember( Core::Entity::PlayerPtr pSender, Core::Entity::PlayerPtr pRecipient, uint64_t senderId, uint64_t recipientId )
 {
    constexpr uint32_t logMessages[] = {
       0, //