diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index 64d56a3a6..f9de65fd9 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -10951,142 +10951,196 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 	RaidGeneral_Struct *ri = (RaidGeneral_Struct*)app->pBuffer;
 	switch (ri->action)
 	{
-	case RaidCommandInviteIntoExisting:
-	case RaidCommandInvite: {
-		Client *i = entity_list.GetClientByName(ri->player_name);
-		if (!i)
-			break;
-		Group *g = i->GetGroup();
-		// These two messages should be generated by the client I think, just do this for now
-		if (i->HasRaid()) {
-			Message(13, "%s is already in a raid.", i->GetName());
-			break;
-		}
-		if (g && !g->IsLeader(i)) {
-			Message(13, "You can only invite an ungrouped player or group leader to join your raid.");
-			break;
-		}
-		//This sends an "invite" to the client in question.
-		auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(RaidGeneral_Struct));
-		RaidGeneral_Struct *rg = (RaidGeneral_Struct*)outapp->pBuffer;
-		strn0cpy(rg->leader_name, ri->leader_name, 64);
-		strn0cpy(rg->player_name, ri->player_name, 64);
-
-		rg->parameter = 0;
-		rg->action = 20;
-		i->QueuePacket(outapp);
-		safe_delete(outapp);
-		break;
-	}
-	case RaidCommandAcceptInvite: {
-		Client *i = entity_list.GetClientByName(ri->player_name);
-		if (i) {
-			if (IsRaidGrouped()) {
-				i->Message_StringID(0, ALREADY_IN_RAID, GetName()); //group failed, must invite members not in raid...
-				return;
+		case RaidCommandInviteIntoExisting:
+		case RaidCommandInvite: {
+			Client *i = entity_list.GetClientByName(ri->player_name);
+			if (!i)
+				break;
+			Group *g = i->GetGroup();
+			// These two messages should be generated by the client I think, just do this for now
+			if (i->HasRaid()) {
+				Message(13, "%s is already in a raid.", i->GetName());
+				break;
 			}
-			Raid *r = entity_list.GetRaidByClient(i);
-			if (r) {
-				r->VerifyRaid();
-				Group *g = GetGroup();
-				if (g) {
-					if (g->GroupCount() + r->RaidCount() > MAX_RAID_MEMBERS)
-					{
-						i->Message(13, "Invite failed, group invite would create a raid larger than the maximum number of members allowed.");
-						return;
-					}
-				}
-				else {
-					if (1 + r->RaidCount() > MAX_RAID_MEMBERS)
-					{
-						i->Message(13, "Invite failed, member invite would create a raid larger than the maximum number of members allowed.");
-						return;
-					}
-				}
-				if (g) {//add us all
-					uint32 freeGroup = r->GetFreeGroup();
-					Client *addClient = nullptr;
-					for (int x = 0; x < 6; x++)
-					{
-						if (g->members[x]) {
-							Client *c = nullptr;
-							if (g->members[x]->IsClient())
-								c = g->members[x]->CastToClient();
-							else
-								continue;
+			if (g && !g->IsLeader(i)) {
+				Message(13, "You can only invite an ungrouped player or group leader to join your raid.");
+				break;
+			}
+			//This sends an "invite" to the client in question.
+			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(RaidGeneral_Struct));
+			RaidGeneral_Struct *rg = (RaidGeneral_Struct*)outapp->pBuffer;
+			strn0cpy(rg->leader_name, ri->leader_name, 64);
+			strn0cpy(rg->player_name, ri->player_name, 64);
 
-							if (!addClient)
-							{
-								addClient = c;
-								r->SetGroupLeader(addClient->GetName());
-							}
-
-							r->SendRaidCreate(c);
-							r->SendMakeLeaderPacketTo(r->leadername, c);
-							if (g->IsLeader(g->members[x]))
-								r->AddMember(c, freeGroup, false, true);
-							else
-								r->AddMember(c, freeGroup);
-							r->SendBulkRaid(c);
-							if (r->IsLocked()) {
-								r->SendRaidLockTo(c);
-							}
+			rg->parameter = 0;
+			rg->action = 20;
+			i->QueuePacket(outapp);
+			safe_delete(outapp);
+			break;
+		}
+		case RaidCommandAcceptInvite: {
+			Client *i = entity_list.GetClientByName(ri->player_name);
+			if (i) {
+				if (IsRaidGrouped()) {
+					i->Message_StringID(0, ALREADY_IN_RAID, GetName()); //group failed, must invite members not in raid...
+					return;
+				}
+				Raid *r = entity_list.GetRaidByClient(i);
+				if (r) {
+					r->VerifyRaid();
+					Group *g = GetGroup();
+					if (g) {
+						if (g->GroupCount() + r->RaidCount() > MAX_RAID_MEMBERS)
+						{
+							i->Message(13, "Invite failed, group invite would create a raid larger than the maximum number of members allowed.");
+							return;
 						}
 					}
-					g->JoinRaidXTarget(r);
-					g->DisbandGroup(true);
-					r->GroupUpdate(freeGroup);
-				}
-				else {
-					r->SendRaidCreate(this);
-					r->SendMakeLeaderPacketTo(r->leadername, this);
-					r->AddMember(this);
-					r->SendBulkRaid(this);
-					if (r->IsLocked()) {
-						r->SendRaidLockTo(this);
+					else {
+						if (1 + r->RaidCount() > MAX_RAID_MEMBERS)
+						{
+							i->Message(13, "Invite failed, member invite would create a raid larger than the maximum number of members allowed.");
+							return;
+						}
 					}
-				}
-			}
-			else
-			{
-				Group *ig = i->GetGroup();
-				Group *g = GetGroup();
-				if (g) //if our target has a group
-				{
-					r = new Raid(i);
-					entity_list.AddRaid(r);
-					r->SetRaidDetails();
-
-					uint32 groupFree = r->GetFreeGroup(); //get a free group
-					if (ig) { //if we already have a group then cycle through adding us...
-						Client *addClientig = nullptr;
+					if (g) {//add us all
+						uint32 freeGroup = r->GetFreeGroup();
+						Client *addClient = nullptr;
 						for (int x = 0; x < 6; x++)
 						{
-							if (ig->members[x]) {
-								if (!addClientig) {
-									if (ig->members[x]->IsClient()) {
-										addClientig = ig->members[x]->CastToClient();
-										r->SetGroupLeader(addClientig->GetName());
+							if (g->members[x]) {
+								Client *c = nullptr;
+								if (g->members[x]->IsClient())
+									c = g->members[x]->CastToClient();
+								else
+									continue;
+
+								if (!addClient)
+								{
+									addClient = c;
+									r->SetGroupLeader(addClient->GetName());
+								}
+
+								r->SendRaidCreate(c);
+								r->SendMakeLeaderPacketTo(r->leadername, c);
+								if (g->IsLeader(g->members[x]))
+									r->AddMember(c, freeGroup, false, true);
+								else
+									r->AddMember(c, freeGroup);
+								r->SendBulkRaid(c);
+								if (r->IsLocked()) {
+									r->SendRaidLockTo(c);
+								}
+							}
+						}
+						g->JoinRaidXTarget(r);
+						g->DisbandGroup(true);
+						r->GroupUpdate(freeGroup);
+					}
+					else {
+						r->SendRaidCreate(this);
+						r->SendMakeLeaderPacketTo(r->leadername, this);
+						r->AddMember(this);
+						r->SendBulkRaid(this);
+						if (r->IsLocked()) {
+							r->SendRaidLockTo(this);
+						}
+					}
+				}
+				else
+				{
+					Group *ig = i->GetGroup();
+					Group *g = GetGroup();
+					if (g) //if our target has a group
+					{
+						r = new Raid(i);
+						entity_list.AddRaid(r);
+						r->SetRaidDetails();
+
+						uint32 groupFree = r->GetFreeGroup(); //get a free group
+						if (ig) { //if we already have a group then cycle through adding us...
+							Client *addClientig = nullptr;
+							for (int x = 0; x < 6; x++)
+							{
+								if (ig->members[x]) {
+									if (!addClientig) {
+										if (ig->members[x]->IsClient()) {
+											addClientig = ig->members[x]->CastToClient();
+											r->SetGroupLeader(addClientig->GetName());
+										}
+									}
+									if (ig->IsLeader(ig->members[x])) {
+										Client *c = nullptr;
+										if (ig->members[x]->IsClient())
+											c = ig->members[x]->CastToClient();
+										else
+											continue;
+										r->SendRaidCreate(c);
+										r->SendMakeLeaderPacketTo(r->leadername, c);
+										r->AddMember(c, groupFree, true, true, true);
+										r->SendBulkRaid(c);
+										if (r->IsLocked()) {
+											r->SendRaidLockTo(c);
+										}
+									}
+									else {
+										Client *c = nullptr;
+										if (ig->members[x]->IsClient())
+											c = ig->members[x]->CastToClient();
+										else
+											continue;
+										r->SendRaidCreate(c);
+										r->SendMakeLeaderPacketTo(r->leadername, c);
+										r->AddMember(c, groupFree);
+										r->SendBulkRaid(c);
+										if (r->IsLocked()) {
+											r->SendRaidLockTo(c);
+										}
 									}
 								}
-								if (ig->IsLeader(ig->members[x])) {
+							}
+							ig->JoinRaidXTarget(r, true);
+							ig->DisbandGroup(true);
+							r->GroupUpdate(groupFree);
+							groupFree = r->GetFreeGroup();
+						}
+						else { //else just add the inviter
+							r->SendRaidCreate(i);
+							r->AddMember(i, 0xFFFFFFFF, true, false, true);
+						}
+
+						Client *addClient = nullptr;
+						//now add the existing group
+						for (int x = 0; x < 6; x++)
+						{
+							if (g->members[x]) {
+								if (!addClient)
+								{
+									if (g->members[x]->IsClient()) {
+										addClient = g->members[x]->CastToClient();
+										r->SetGroupLeader(addClient->GetName());
+									}
+								}
+								if (g->IsLeader(g->members[x]))
+								{
 									Client *c = nullptr;
-									if (ig->members[x]->IsClient())
-										c = ig->members[x]->CastToClient();
+									if (g->members[x]->IsClient())
+										c = g->members[x]->CastToClient();
 									else
 										continue;
 									r->SendRaidCreate(c);
 									r->SendMakeLeaderPacketTo(r->leadername, c);
-									r->AddMember(c, groupFree, true, true, true);
+									r->AddMember(c, groupFree, false, true);
 									r->SendBulkRaid(c);
 									if (r->IsLocked()) {
 										r->SendRaidLockTo(c);
 									}
 								}
-								else {
+								else
+								{
 									Client *c = nullptr;
-									if (ig->members[x]->IsClient())
-										c = ig->members[x]->CastToClient();
+									if (g->members[x]->IsClient())
+										c = g->members[x]->CastToClient();
 									else
 										continue;
 									r->SendRaidCreate(c);
@@ -11099,264 +11153,275 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 								}
 							}
 						}
-						ig->JoinRaidXTarget(r, true);
-						ig->DisbandGroup(true);
+						g->JoinRaidXTarget(r);
+						g->DisbandGroup(true);
 						r->GroupUpdate(groupFree);
-						groupFree = r->GetFreeGroup();
 					}
-					else { //else just add the inviter
-						r->SendRaidCreate(i);
-						r->AddMember(i, 0xFFFFFFFF, true, false, true);
-					}
-
-					Client *addClient = nullptr;
-					//now add the existing group
-					for (int x = 0; x < 6; x++)
+					else // target does not have a group
 					{
-						if (g->members[x]) {
-							if (!addClient)
+						if (ig) {
+							r = new Raid(i);
+							entity_list.AddRaid(r);
+							r->SetRaidDetails();
+							Client *addClientig = nullptr;
+							for (int x = 0; x < 6; x++)
 							{
-								if (g->members[x]->IsClient()) {
-									addClient = g->members[x]->CastToClient();
-									r->SetGroupLeader(addClient->GetName());
-								}
-							}
-							if (g->IsLeader(g->members[x]))
-							{
-								Client *c = nullptr;
-								if (g->members[x]->IsClient())
-									c = g->members[x]->CastToClient();
-								else
-									continue;
-								r->SendRaidCreate(c);
-								r->SendMakeLeaderPacketTo(r->leadername, c);
-								r->AddMember(c, groupFree, false, true);
-								r->SendBulkRaid(c);
-								if (r->IsLocked()) {
-									r->SendRaidLockTo(c);
-								}
-							}
-							else
-							{
-								Client *c = nullptr;
-								if (g->members[x]->IsClient())
-									c = g->members[x]->CastToClient();
-								else
-									continue;
-								r->SendRaidCreate(c);
-								r->SendMakeLeaderPacketTo(r->leadername, c);
-								r->AddMember(c, groupFree);
-								r->SendBulkRaid(c);
-								if (r->IsLocked()) {
-									r->SendRaidLockTo(c);
-								}
-							}
-						}
-					}
-					g->JoinRaidXTarget(r);
-					g->DisbandGroup(true);
-					r->GroupUpdate(groupFree);
-				}
-				else // target does not have a group
-				{
-					if (ig) {
-						r = new Raid(i);
-						entity_list.AddRaid(r);
-						r->SetRaidDetails();
-						Client *addClientig = nullptr;
-						for (int x = 0; x < 6; x++)
-						{
-							if (ig->members[x])
-							{
-								if (!addClientig) {
-									if (ig->members[x]->IsClient()) {
-										addClientig = ig->members[x]->CastToClient();
-										r->SetGroupLeader(addClientig->GetName());
-									}
-								}
-								if (ig->IsLeader(ig->members[x]))
+								if (ig->members[x])
 								{
-									Client *c = nullptr;
-									if (ig->members[x]->IsClient())
-										c = ig->members[x]->CastToClient();
-									else
-										continue;
-
-									r->SendRaidCreate(c);
-									r->SendMakeLeaderPacketTo(r->leadername, c);
-									r->AddMember(c, 0, true, true, true);
-									r->SendBulkRaid(c);
-									if (r->IsLocked()) {
-										r->SendRaidLockTo(c);
+									if (!addClientig) {
+										if (ig->members[x]->IsClient()) {
+											addClientig = ig->members[x]->CastToClient();
+											r->SetGroupLeader(addClientig->GetName());
+										}
 									}
-								}
-								else
-								{
-									Client *c = nullptr;
-									if (ig->members[x]->IsClient())
-										c = ig->members[x]->CastToClient();
-									else
-										continue;
+									if (ig->IsLeader(ig->members[x]))
+									{
+										Client *c = nullptr;
+										if (ig->members[x]->IsClient())
+											c = ig->members[x]->CastToClient();
+										else
+											continue;
 
-									r->SendRaidCreate(c);
-									r->SendMakeLeaderPacketTo(r->leadername, c);
-									r->AddMember(c, 0);
-									r->SendBulkRaid(c);
-									if (r->IsLocked()) {
-										r->SendRaidLockTo(c);
+										r->SendRaidCreate(c);
+										r->SendMakeLeaderPacketTo(r->leadername, c);
+										r->AddMember(c, 0, true, true, true);
+										r->SendBulkRaid(c);
+										if (r->IsLocked()) {
+											r->SendRaidLockTo(c);
+										}
+									}
+									else
+									{
+										Client *c = nullptr;
+										if (ig->members[x]->IsClient())
+											c = ig->members[x]->CastToClient();
+										else
+											continue;
+
+										r->SendRaidCreate(c);
+										r->SendMakeLeaderPacketTo(r->leadername, c);
+										r->AddMember(c, 0);
+										r->SendBulkRaid(c);
+										if (r->IsLocked()) {
+											r->SendRaidLockTo(c);
+										}
 									}
 								}
 							}
+							r->SendRaidCreate(this);
+							r->SendMakeLeaderPacketTo(r->leadername, this);
+							r->SendBulkRaid(this);
+							ig->JoinRaidXTarget(r, true);
+							r->AddMember(this);
+							ig->DisbandGroup(true);
+							r->GroupUpdate(0);
+							if (r->IsLocked()) {
+								r->SendRaidLockTo(this);
+							}
 						}
-						r->SendRaidCreate(this);
-						r->SendMakeLeaderPacketTo(r->leadername, this);
-						r->SendBulkRaid(this);
-						ig->JoinRaidXTarget(r, true);
-						r->AddMember(this);
-						ig->DisbandGroup(true);
-						r->GroupUpdate(0);
-						if (r->IsLocked()) {
-							r->SendRaidLockTo(this);
-						}
-					}
-					else { // neither has a group
-						r = new Raid(i);
-						entity_list.AddRaid(r);
-						r->SetRaidDetails();
-						r->SendRaidCreate(i);
-						r->SendRaidCreate(this);
-						r->SendMakeLeaderPacketTo(r->leadername, this);
-						r->AddMember(i, 0xFFFFFFFF, true, false, true);
-						r->SendBulkRaid(this);
-						r->AddMember(this);
-						if (r->IsLocked()) {
-							r->SendRaidLockTo(this);
+						else { // neither has a group
+							r = new Raid(i);
+							entity_list.AddRaid(r);
+							r->SetRaidDetails();
+							r->SendRaidCreate(i);
+							r->SendRaidCreate(this);
+							r->SendMakeLeaderPacketTo(r->leadername, this);
+							r->AddMember(i, 0xFFFFFFFF, true, false, true);
+							r->SendBulkRaid(this);
+							r->AddMember(this);
+							if (r->IsLocked()) {
+								r->SendRaidLockTo(this);
+							}
 						}
 					}
 				}
 			}
+			break;
 		}
-		break;
-	}
-	case RaidCommandDisband: {
-		Raid *r = entity_list.GetRaidByClient(this);
-		if (r) {
-			//if(this == r->GetLeader()){
-			uint32 grp = r->GetGroup(ri->leader_name);
+		case RaidCommandDisband: {
+			Raid *r = entity_list.GetRaidByClient(this);
+			if (r) {
+				//if(this == r->GetLeader()){
+				uint32 grp = r->GetGroup(ri->leader_name);
 
-			if (grp < 12) {
-				uint32 i = r->GetPlayerIndex(ri->leader_name);
-				if (r->members[i].IsGroupLeader) { //assign group leader to someone else
-					for (int x = 0; x < MAX_RAID_MEMBERS; x++) {
-						if (strlen(r->members[x].membername) > 0 && i != x) {
-							if (r->members[x].GroupNumber == grp) {
-								r->SetGroupLeader(ri->leader_name, false);
-								r->SetGroupLeader(r->members[x].membername);
-								r->UpdateGroupAAs(grp);
+				if (grp < 12) {
+					uint32 i = r->GetPlayerIndex(ri->leader_name);
+					if (r->members[i].IsGroupLeader) { //assign group leader to someone else
+						for (int x = 0; x < MAX_RAID_MEMBERS; x++) {
+							if (strlen(r->members[x].membername) > 0 && i != x) {
+								if (r->members[x].GroupNumber == grp) {
+									r->SetGroupLeader(ri->leader_name, false);
+									r->SetGroupLeader(r->members[x].membername);
+									r->UpdateGroupAAs(grp);
+									break;
+								}
+							}
+						}
+
+					}
+					if (r->members[i].IsRaidLeader) {
+						for (int x = 0; x < MAX_RAID_MEMBERS; x++) {
+							if (strlen(r->members[x].membername) > 0 && strcmp(r->members[x].membername, r->members[i].membername) != 0)
+							{
+								r->SetRaidLeader(r->members[i].membername, r->members[x].membername);
+								r->UpdateRaidAAs();
+								r->SendAllRaidLeadershipAA();
 								break;
 							}
 						}
 					}
-
 				}
-				if (r->members[i].IsRaidLeader) {
-					for (int x = 0; x < MAX_RAID_MEMBERS; x++) {
-						if (strlen(r->members[x].membername) > 0 && strcmp(r->members[x].membername, r->members[i].membername) != 0)
-						{
-							r->SetRaidLeader(r->members[i].membername, r->members[x].membername);
-							r->UpdateRaidAAs();
-							r->SendAllRaidLeadershipAA();
-							break;
-						}
-					}
-				}
-			}
 
-			r->RemoveMember(ri->leader_name);
-			Client *c = entity_list.GetClientByName(ri->leader_name);
-			if (c)
-				r->SendGroupDisband(c);
-			else {
-				auto pack =
-					new ServerPacket(ServerOP_RaidGroupDisband, sizeof(ServerRaidGeneralAction_Struct));
-				ServerRaidGeneralAction_Struct* rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
-				rga->rid = GetID();
-				rga->zoneid = zone->GetZoneID();
-				rga->instance_id = zone->GetInstanceID();
-				strn0cpy(rga->playername, ri->leader_name, 64);
-				worldserver.SendPacket(pack);
-				safe_delete(pack);
+				r->RemoveMember(ri->leader_name);
+				Client *c = entity_list.GetClientByName(ri->leader_name);
+				if (c)
+					r->SendGroupDisband(c);
+				else {
+					auto pack =
+						new ServerPacket(ServerOP_RaidGroupDisband, sizeof(ServerRaidGeneralAction_Struct));
+					ServerRaidGeneralAction_Struct* rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
+					rga->rid = GetID();
+					rga->zoneid = zone->GetZoneID();
+					rga->instance_id = zone->GetInstanceID();
+					strn0cpy(rga->playername, ri->leader_name, 64);
+					worldserver.SendPacket(pack);
+					safe_delete(pack);
+				}
+				//r->SendRaidGroupRemove(ri->leader_name, grp);
+				r->GroupUpdate(grp);// break
+									//}
 			}
-			//r->SendRaidGroupRemove(ri->leader_name, grp);
-			r->GroupUpdate(grp);// break
-								//}
+			break;
 		}
-		break;
-	}
-	case RaidCommandMoveGroup:
-	{
-		Raid *r = entity_list.GetRaidByClient(this);
-		if (r)
+		case RaidCommandMoveGroup:
 		{
-			if (ri->parameter < 12) //moving to a group
+			Raid *r = entity_list.GetRaidByClient(this);
+			if (r)
 			{
-				uint8 grpcount = r->GroupCount(ri->parameter);
-
-				if (grpcount < 6)
+				if (ri->parameter < 12) //moving to a group
 				{
-					Client *c = entity_list.GetClientByName(ri->leader_name);
-					uint32 oldgrp = r->GetGroup(ri->leader_name);
-					if (ri->parameter == oldgrp) //don't rejoin grp if we order to join same group.
-						break;
+					uint8 grpcount = r->GroupCount(ri->parameter);
 
-					if (r->members[r->GetPlayerIndex(ri->leader_name)].IsGroupLeader)
+					if (grpcount < 6)
 					{
-						r->SetGroupLeader(ri->leader_name, false);
-						if (oldgrp < 12) { //we were the leader of our old grp
-							for (int x = 0; x < MAX_RAID_MEMBERS; x++) //assign a new grp leader if we can
-							{
-								if (r->members[x].GroupNumber == oldgrp)
+						Client *c = entity_list.GetClientByName(ri->leader_name);
+						uint32 oldgrp = r->GetGroup(ri->leader_name);
+						if (ri->parameter == oldgrp) //don't rejoin grp if we order to join same group.
+							break;
+
+						if (r->members[r->GetPlayerIndex(ri->leader_name)].IsGroupLeader)
+						{
+							r->SetGroupLeader(ri->leader_name, false);
+							if (oldgrp < 12) { //we were the leader of our old grp
+								for (int x = 0; x < MAX_RAID_MEMBERS; x++) //assign a new grp leader if we can
 								{
-									if (strcmp(ri->leader_name, r->members[x].membername) != 0 && strlen(ri->leader_name) > 0)
+									if (r->members[x].GroupNumber == oldgrp)
 									{
-										r->SetGroupLeader(r->members[x].membername);
-										r->UpdateGroupAAs(oldgrp);
-										Client *cgl = entity_list.GetClientByName(r->members[x].membername);
-										if (cgl) {
-											r->SendRaidRemove(r->members[x].membername, cgl);
-											r->SendRaidCreate(cgl);
-											r->SendMakeLeaderPacketTo(r->leadername, cgl);
-											r->SendRaidAdd(r->members[x].membername, cgl);
-											r->SendBulkRaid(cgl);
-											if (r->IsLocked()) {
-												r->SendRaidLockTo(cgl);
+										if (strcmp(ri->leader_name, r->members[x].membername) != 0 && strlen(ri->leader_name) > 0)
+										{
+											r->SetGroupLeader(r->members[x].membername);
+											r->UpdateGroupAAs(oldgrp);
+											Client *cgl = entity_list.GetClientByName(r->members[x].membername);
+											if (cgl) {
+												r->SendRaidRemove(r->members[x].membername, cgl);
+												r->SendRaidCreate(cgl);
+												r->SendMakeLeaderPacketTo(r->leadername, cgl);
+												r->SendRaidAdd(r->members[x].membername, cgl);
+												r->SendBulkRaid(cgl);
+												if (r->IsLocked()) {
+													r->SendRaidLockTo(cgl);
+												}
 											}
+											else {
+												auto pack = new ServerPacket(
+													ServerOP_RaidChangeGroup,
+													sizeof(
+														ServerRaidGeneralAction_Struct));
+												ServerRaidGeneralAction_Struct *rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
+												rga->rid = r->GetID();
+												strn0cpy(rga->playername, r->members[x].membername, 64);
+												rga->zoneid = zone->GetZoneID();
+												rga->instance_id = zone->GetInstanceID();
+												worldserver.SendPacket(pack);
+												safe_delete(pack);
+											}
+											break;
 										}
-										else {
-											auto pack = new ServerPacket(
-												ServerOP_RaidChangeGroup,
-												sizeof(
-													ServerRaidGeneralAction_Struct));
-											ServerRaidGeneralAction_Struct *rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
-											rga->rid = r->GetID();
-											strn0cpy(rga->playername, r->members[x].membername, 64);
-											rga->zoneid = zone->GetZoneID();
-											rga->instance_id = zone->GetInstanceID();
-											worldserver.SendPacket(pack);
-											safe_delete(pack);
-										}
-										break;
 									}
 								}
 							}
 						}
-					}
-					if (grpcount == 0) {
-						r->SetGroupLeader(ri->leader_name);
-						r->UpdateGroupAAs(ri->parameter);
-					}
+						if (grpcount == 0) {
+							r->SetGroupLeader(ri->leader_name);
+							r->UpdateGroupAAs(ri->parameter);
+						}
 
-					r->MoveMember(ri->leader_name, ri->parameter);
+						r->MoveMember(ri->leader_name, ri->parameter);
+						if (c) {
+							r->SendGroupDisband(c);
+						}
+						else {
+							auto pack = new ServerPacket(ServerOP_RaidGroupDisband,
+								sizeof(ServerRaidGeneralAction_Struct));
+							ServerRaidGeneralAction_Struct* rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
+							rga->rid = r->GetID();
+							rga->zoneid = zone->GetZoneID();
+							rga->instance_id = zone->GetInstanceID();
+							strn0cpy(rga->playername, ri->leader_name, 64);
+							worldserver.SendPacket(pack);
+							safe_delete(pack);
+						}
+						//r->SendRaidGroupAdd(ri->leader_name, ri->parameter);
+						//r->SendRaidGroupRemove(ri->leader_name, oldgrp);
+						//r->SendGroupUpdate(c);
+						//break
+						r->GroupUpdate(ri->parameter); //send group update to our new group
+						if (oldgrp < 12) //if our old was a group send update there too
+							r->GroupUpdate(oldgrp);
+
+						//r->SendMakeGroupLeaderPacketAll();
+					}
+				}
+				else //moving to ungrouped
+				{
+					Client *c = entity_list.GetClientByName(ri->leader_name);
+					uint32 oldgrp = r->GetGroup(ri->leader_name);
+					if (r->members[r->GetPlayerIndex(ri->leader_name)].IsGroupLeader) {
+						r->SetGroupLeader(ri->leader_name, false);
+						for (int x = 0; x < MAX_RAID_MEMBERS; x++)
+						{
+							if (r->members[x].GroupNumber == oldgrp && strlen(r->members[x].membername) > 0 && strcmp(r->members[x].membername, ri->leader_name) != 0)
+							{
+								r->SetGroupLeader(r->members[x].membername);
+								r->UpdateGroupAAs(oldgrp);
+								Client *cgl = entity_list.GetClientByName(r->members[x].membername);
+								if (cgl) {
+									r->SendRaidRemove(r->members[x].membername, cgl);
+									r->SendRaidCreate(cgl);
+									r->SendMakeLeaderPacketTo(r->leadername, cgl);
+									r->SendRaidAdd(r->members[x].membername, cgl);
+									r->SendBulkRaid(cgl);
+									if (r->IsLocked()) {
+										r->SendRaidLockTo(cgl);
+									}
+								}
+								else {
+									auto pack = new ServerPacket(
+										ServerOP_RaidChangeGroup,
+										sizeof(ServerRaidGeneralAction_Struct));
+									ServerRaidGeneralAction_Struct *rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
+									rga->rid = r->GetID();
+									strn0cpy(rga->playername, r->members[x].membername, 64);
+									rga->zoneid = zone->GetZoneID();
+									rga->instance_id = zone->GetInstanceID();
+									worldserver.SendPacket(pack);
+									safe_delete(pack);
+								}
+								break;
+							}
+						}
+					}
+					r->MoveMember(ri->leader_name, 0xFFFFFFFF);
 					if (c) {
 						r->SendGroupDisband(c);
 					}
@@ -11371,169 +11436,117 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 						worldserver.SendPacket(pack);
 						safe_delete(pack);
 					}
-					//r->SendRaidGroupAdd(ri->leader_name, ri->parameter);
 					//r->SendRaidGroupRemove(ri->leader_name, oldgrp);
-					//r->SendGroupUpdate(c);
-					//break
-					r->GroupUpdate(ri->parameter); //send group update to our new group
-					if (oldgrp < 12) //if our old was a group send update there too
-						r->GroupUpdate(oldgrp);
-
+					r->GroupUpdate(oldgrp);
 					//r->SendMakeGroupLeaderPacketAll();
 				}
 			}
-			else //moving to ungrouped
-			{
-				Client *c = entity_list.GetClientByName(ri->leader_name);
-				uint32 oldgrp = r->GetGroup(ri->leader_name);
-				if (r->members[r->GetPlayerIndex(ri->leader_name)].IsGroupLeader) {
-					r->SetGroupLeader(ri->leader_name, false);
-					for (int x = 0; x < MAX_RAID_MEMBERS; x++)
-					{
-						if (r->members[x].GroupNumber == oldgrp && strlen(r->members[x].membername) > 0 && strcmp(r->members[x].membername, ri->leader_name) != 0)
-						{
-							r->SetGroupLeader(r->members[x].membername);
-							r->UpdateGroupAAs(oldgrp);
-							Client *cgl = entity_list.GetClientByName(r->members[x].membername);
-							if (cgl) {
-								r->SendRaidRemove(r->members[x].membername, cgl);
-								r->SendRaidCreate(cgl);
-								r->SendMakeLeaderPacketTo(r->leadername, cgl);
-								r->SendRaidAdd(r->members[x].membername, cgl);
-								r->SendBulkRaid(cgl);
-								if (r->IsLocked()) {
-									r->SendRaidLockTo(cgl);
-								}
-							}
-							else {
-								auto pack = new ServerPacket(
-									ServerOP_RaidChangeGroup,
-									sizeof(ServerRaidGeneralAction_Struct));
-								ServerRaidGeneralAction_Struct *rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
-								rga->rid = r->GetID();
-								strn0cpy(rga->playername, r->members[x].membername, 64);
-								rga->zoneid = zone->GetZoneID();
-								rga->instance_id = zone->GetInstanceID();
-								worldserver.SendPacket(pack);
-								safe_delete(pack);
-							}
-							break;
-						}
-					}
-				}
-				r->MoveMember(ri->leader_name, 0xFFFFFFFF);
-				if (c) {
-					r->SendGroupDisband(c);
-				}
-				else {
-					auto pack = new ServerPacket(ServerOP_RaidGroupDisband,
-						sizeof(ServerRaidGeneralAction_Struct));
-					ServerRaidGeneralAction_Struct* rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
-					rga->rid = r->GetID();
-					rga->zoneid = zone->GetZoneID();
-					rga->instance_id = zone->GetInstanceID();
-					strn0cpy(rga->playername, ri->leader_name, 64);
-					worldserver.SendPacket(pack);
-					safe_delete(pack);
-				}
-				//r->SendRaidGroupRemove(ri->leader_name, oldgrp);
-				r->GroupUpdate(oldgrp);
-				//r->SendMakeGroupLeaderPacketAll();
+
+			Client *client_moved = entity_list.GetClientByName(ri->leader_name);
+
+			if (client_moved) {
+				client_moved->GetRaid()->SendHPManaEndPacketsTo(client_moved);
+				client_moved->GetRaid()->SendHPManaEndPacketsFrom(client_moved);
+
+				Log(Logs::General, Logs::HP_Update,
+					"Client::Handle_OP_RaidCommand :: %s sending and recieving HP/Mana/End updates",
+					client_moved->GetCleanName()
+				);
 			}
-		}
-		break;
-	}
-	case RaidCommandRaidLock:
-	{
-		Raid *r = entity_list.GetRaidByClient(this);
-		if (r)
-		{
-			if (!r->IsLocked())
-				r->LockRaid(true);
-			else
-				r->SendRaidLockTo(this);
-		}
-		break;
-	}
-	case RaidCommandRaidUnlock:
-	{
-		Raid *r = entity_list.GetRaidByClient(this);
-		if (r)
-		{
-			if (r->IsLocked())
-				r->LockRaid(false);
-			else
-				r->SendRaidUnlockTo(this);
-		}
-		break;
-	}
-	case RaidCommandLootType2:
-	case RaidCommandLootType:
-	{
-		Raid *r = entity_list.GetRaidByClient(this);
-		if (r)
-		{
-			Message(15, "Loot type changed to: %d.", ri->parameter);
-			r->ChangeLootType(ri->parameter);
-		}
-		break;
-	}
 
-	case RaidCommandAddLooter2:
-	case RaidCommandAddLooter:
-	{
-		Raid *r = entity_list.GetRaidByClient(this);
-		if (r)
-		{
-			Message(15, "Adding %s as a raid looter.", ri->leader_name);
-			r->AddRaidLooter(ri->leader_name);
-		}
-		break;
-	}
-
-	case RaidCommandRemoveLooter2:
-	case RaidCommandRemoveLooter:
-	{
-		Raid *r = entity_list.GetRaidByClient(this);
-		if (r)
-		{
-			Message(15, "Removing %s as a raid looter.", ri->leader_name);
-			r->RemoveRaidLooter(ri->leader_name);
-		}
-		break;
-	}
-
-	case RaidCommandMakeLeader:
-	{
-		Raid *r = entity_list.GetRaidByClient(this);
-		if (r)
-		{
-			if (strcmp(r->leadername, GetName()) == 0) {
-				r->SetRaidLeader(GetName(), ri->leader_name);
-				r->UpdateRaidAAs();
-				r->SendAllRaidLeadershipAA();
-			}
-		}
-		break;
-	}
-
-	case RaidCommandSetMotd:
-	{
-		Raid *r = entity_list.GetRaidByClient(this);
-		if (!r)
 			break;
-		// we don't use the RaidGeneral here!
-		RaidMOTD_Struct *motd = (RaidMOTD_Struct *)app->pBuffer;
-		r->SetRaidMOTD(std::string(motd->motd));
-		r->SaveRaidMOTD();
-		r->SendRaidMOTDToWorld();
-		break;
-	}
+		}
+		case RaidCommandRaidLock:
+		{
+			Raid *r = entity_list.GetRaidByClient(this);
+			if (r)
+			{
+				if (!r->IsLocked())
+					r->LockRaid(true);
+				else
+					r->SendRaidLockTo(this);
+			}
+			break;
+		}
+		case RaidCommandRaidUnlock:
+		{
+			Raid *r = entity_list.GetRaidByClient(this);
+			if (r)
+			{
+				if (r->IsLocked())
+					r->LockRaid(false);
+				else
+					r->SendRaidUnlockTo(this);
+			}
+			break;
+		}
+		case RaidCommandLootType2:
+		case RaidCommandLootType:
+		{
+			Raid *r = entity_list.GetRaidByClient(this);
+			if (r)
+			{
+				Message(15, "Loot type changed to: %d.", ri->parameter);
+				r->ChangeLootType(ri->parameter);
+			}
+			break;
+		}
 
-	default: {
-		Message(13, "Raid command (%d) NYI", ri->action);
-		break;
-	}
+		case RaidCommandAddLooter2:
+		case RaidCommandAddLooter:
+		{
+			Raid *r = entity_list.GetRaidByClient(this);
+			if (r)
+			{
+				Message(15, "Adding %s as a raid looter.", ri->leader_name);
+				r->AddRaidLooter(ri->leader_name);
+			}
+			break;
+		}
+
+		case RaidCommandRemoveLooter2:
+		case RaidCommandRemoveLooter:
+		{
+			Raid *r = entity_list.GetRaidByClient(this);
+			if (r)
+			{
+				Message(15, "Removing %s as a raid looter.", ri->leader_name);
+				r->RemoveRaidLooter(ri->leader_name);
+			}
+			break;
+		}
+
+		case RaidCommandMakeLeader:
+		{
+			Raid *r = entity_list.GetRaidByClient(this);
+			if (r)
+			{
+				if (strcmp(r->leadername, GetName()) == 0) {
+					r->SetRaidLeader(GetName(), ri->leader_name);
+					r->UpdateRaidAAs();
+					r->SendAllRaidLeadershipAA();
+				}
+			}
+			break;
+		}
+
+		case RaidCommandSetMotd:
+		{
+			Raid *r = entity_list.GetRaidByClient(this);
+			if (!r)
+				break;
+			// we don't use the RaidGeneral here!
+			RaidMOTD_Struct *motd = (RaidMOTD_Struct *)app->pBuffer;
+			r->SetRaidMOTD(std::string(motd->motd));
+			r->SaveRaidMOTD();
+			r->SendRaidMOTDToWorld();
+			break;
+		}
+
+		default: {
+			Message(13, "Raid command (%d) NYI", ri->action);
+			break;
+		}
 	}
 }
 
diff --git a/zone/mob.cpp b/zone/mob.cpp
index 33863081a..924f26b69 100644
--- a/zone/mob.cpp
+++ b/zone/mob.cpp
@@ -1383,7 +1383,7 @@ void Mob::SendHPUpdate(bool skip_self /*= false*/, bool force_update_all /*= fal
 	if(IsClient()){
 		Raid *raid = entity_list.GetRaidByClient(CastToClient());
 		if (raid)
-			raid->SendHPPacketsFrom(this);
+			raid->SendHPManaEndPacketsFrom(this);
 	}
 
 	/* Pet - Update master - group and raid if exists */
@@ -1396,7 +1396,7 @@ void Mob::SendHPUpdate(bool skip_self /*= false*/, bool force_update_all /*= fal
 
 		Raid *raid = entity_list.GetRaidByClient(GetOwner()->CastToClient());
 		if(raid)
-			raid->SendHPPacketsFrom(this);
+			raid->SendHPManaEndPacketsFrom(this);
 	}
 
 	/* Send to pet */
diff --git a/zone/raids.cpp b/zone/raids.cpp
index 26845910c..7496d3686 100644
--- a/zone/raids.cpp
+++ b/zone/raids.cpp
@@ -149,7 +149,7 @@ void Raid::AddMember(Client *c, uint32 group, bool rleader, bool groupleader, bo
 	raid_update = c->GetRaid();
 	if (raid_update) {
 		raid_update->SendHPManaEndPacketsTo(c);
-		raid_update->SendHPPacketsFrom(c);
+		raid_update->SendHPManaEndPacketsFrom(c);
 	}
 
 	auto pack = new ServerPacket(ServerOP_RaidAdd, sizeof(ServerRaidGeneralAction_Struct));
@@ -1591,7 +1591,7 @@ void Raid::SendHPManaEndPacketsTo(Client *client)
 	}
 }
 
-void Raid::SendHPPacketsFrom(Mob *mob)
+void Raid::SendHPManaEndPacketsFrom(Mob *mob)
 {
 	if(!mob)
 		return;
diff --git a/zone/raids.h b/zone/raids.h
index df43d7755..068a876ac 100644
--- a/zone/raids.h
+++ b/zone/raids.h
@@ -174,7 +174,7 @@ public:
 	void	VerifyRaid();
 	void	MemberZoned(Client *c);
 	void	SendHPManaEndPacketsTo(Client *c);
-	void	SendHPPacketsFrom(Mob *mob);
+	void	SendHPManaEndPacketsFrom(Mob *mob);
 	void	SendManaPacketFrom(Mob *mob);
 	void	SendEndurancePacketFrom(Mob *mob);
 	void	RaidSay(const char *msg, Client *c);