diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroServerPipelineFactory.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroServerPipelineFactory.java
index ee5507476..44ba4bbbc 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroServerPipelineFactory.java
+++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroServerPipelineFactory.java
@@ -6,6 +6,7 @@ import com.gempukku.lotro.builder.DaoBuilder;
 import com.gempukku.lotro.builder.PacksStorageBuilder;
 import com.gempukku.lotro.builder.ServerBuilder;
 import com.gempukku.lotro.packs.PacksStorage;
+import com.gempukku.polling.LongPollingSystem;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelPipelineFactory;
 import org.jboss.netty.channel.Channels;
diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ChatRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ChatRequestHandler.java
index ba87c00cf..24bc3cc41 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ChatRequestHandler.java
+++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ChatRequestHandler.java
@@ -3,13 +3,13 @@ package com.gempukku.lotro.async.handler;
 import com.gempukku.lotro.PrivateInformationException;
 import com.gempukku.lotro.SubscriptionExpiredException;
 import com.gempukku.lotro.async.HttpProcessingException;
-import com.gempukku.lotro.async.LongPollingResource;
-import com.gempukku.lotro.async.LongPollingSystem;
 import com.gempukku.lotro.async.ResponseWriter;
 import com.gempukku.lotro.chat.ChatMessage;
 import com.gempukku.lotro.chat.ChatRoomMediator;
 import com.gempukku.lotro.chat.ChatServer;
 import com.gempukku.lotro.game.Player;
+import com.gempukku.polling.LongPollingResource;
+import com.gempukku.polling.LongPollingSystem;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.handler.codec.http.HttpMethod;
diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/GameRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/GameRequestHandler.java
index 8bcc61caa..5a393e43e 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/GameRequestHandler.java
+++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/GameRequestHandler.java
@@ -4,8 +4,6 @@ import com.gempukku.lotro.PrivateInformationException;
 import com.gempukku.lotro.SubscriptionConflictException;
 import com.gempukku.lotro.SubscriptionExpiredException;
 import com.gempukku.lotro.async.HttpProcessingException;
-import com.gempukku.lotro.async.LongPollingResource;
-import com.gempukku.lotro.async.LongPollingSystem;
 import com.gempukku.lotro.async.ResponseWriter;
 import com.gempukku.lotro.common.Phase;
 import com.gempukku.lotro.game.LotroGameMediator;
@@ -15,6 +13,8 @@ import com.gempukku.lotro.game.Player;
 import com.gempukku.lotro.game.state.EventSerializer;
 import com.gempukku.lotro.game.state.GameCommunicationChannel;
 import com.gempukku.lotro.game.state.GameEvent;
+import com.gempukku.polling.LongPollingResource;
+import com.gempukku.polling.LongPollingSystem;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.handler.codec.http.*;
 import org.jboss.netty.handler.codec.http.multipart.HttpPostRequestDecoder;
diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java
index 5263c02d5..4bdeb6a00 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java
+++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java
@@ -3,8 +3,6 @@ package com.gempukku.lotro.async.handler;
 import com.gempukku.lotro.SubscriptionConflictException;
 import com.gempukku.lotro.SubscriptionExpiredException;
 import com.gempukku.lotro.async.HttpProcessingException;
-import com.gempukku.lotro.async.LongPollingResource;
-import com.gempukku.lotro.async.LongPollingSystem;
 import com.gempukku.lotro.async.ResponseWriter;
 import com.gempukku.lotro.collection.CollectionsManager;
 import com.gempukku.lotro.db.vo.League;
@@ -20,6 +18,8 @@ import com.gempukku.lotro.league.LeagueSerieData;
 import com.gempukku.lotro.league.LeagueService;
 import com.gempukku.lotro.logic.GameUtils;
 import com.gempukku.lotro.logic.vo.LotroDeck;
+import com.gempukku.polling.LongPollingResource;
+import com.gempukku.polling.LongPollingSystem;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.handler.codec.http.HttpMethod;
 import org.jboss.netty.handler.codec.http.HttpRequest;
diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LongPollableResource.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/polling/LongPollableResource.java
similarity index 82%
rename from gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LongPollableResource.java
rename to gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/polling/LongPollableResource.java
index 0340966d0..a91b7297b 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LongPollableResource.java
+++ b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/polling/LongPollableResource.java
@@ -1,4 +1,4 @@
-package com.gempukku.lotro.async;
+package com.gempukku.polling;
 
 public interface LongPollableResource {
     public void registerForChanges(LongPollingResource longPollingResource);
diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LongPollingResource.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/polling/LongPollingResource.java
similarity index 77%
rename from gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LongPollingResource.java
rename to gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/polling/LongPollingResource.java
index c2408d27c..9d4cd71da 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LongPollingResource.java
+++ b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/polling/LongPollingResource.java
@@ -1,4 +1,4 @@
-package com.gempukku.lotro.async;
+package com.gempukku.polling;
 
 public interface LongPollingResource {
     public boolean isChanged();
diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LongPollingSystem.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/polling/LongPollingSystem.java
similarity index 98%
rename from gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LongPollingSystem.java
rename to gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/polling/LongPollingSystem.java
index c3c7061ab..ee7ced615 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LongPollingSystem.java
+++ b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/polling/LongPollingSystem.java
@@ -1,4 +1,4 @@
-package com.gempukku.lotro.async;
+package com.gempukku.polling;
 
 import org.apache.log4j.Logger;
 
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameCommunicationChannel.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameCommunicationChannel.java
index 71845cf1c..d1fc77722 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameCommunicationChannel.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameCommunicationChannel.java
@@ -30,7 +30,12 @@ public class GameCommunicationChannel implements GameStateListener {
         List<String> participantIds = new LinkedList<String>();
         for (String participant : participants)
             participantIds.add(participant);
-        _events.add(new GameEvent(P).participantId(_self).allParticipantIds(participantIds));
+        appendEvent(new GameEvent(P).participantId(_self).allParticipantIds(participantIds));
+    }
+
+    private void appendEvent(GameEvent event) {
+        _events.add(event);
+
     }
 
     private int[] getCardIds(Collection<PhysicalCard> cards) {
@@ -45,12 +50,12 @@ public class GameCommunicationChannel implements GameStateListener {
 
     @Override
     public void addAssignment(PhysicalCard freePeople, Set<PhysicalCard> minions) {
-        _events.add(new GameEvent(AA).cardId(freePeople.getCardId()).otherCardIds(getCardIds(minions)));
+        appendEvent(new GameEvent(AA).cardId(freePeople.getCardId()).otherCardIds(getCardIds(minions)));
     }
 
     @Override
     public void removeAssignment(PhysicalCard freePeople) {
-        _events.add(new GameEvent(RA).cardId(freePeople.getCardId()));
+        appendEvent(new GameEvent(RA).cardId(freePeople.getCardId()));
     }
 
     @Override
@@ -58,38 +63,38 @@ public class GameCommunicationChannel implements GameStateListener {
         GameEvent gameEvent = new GameEvent(SS).otherCardIds(getCardIds(minions));
         if (freePeople != null)
             gameEvent.cardId(freePeople.getCardId());
-        _events.add(gameEvent);
+        appendEvent(gameEvent);
     }
 
     @Override
     public void addToSkirmish(PhysicalCard card) {
-        _events.add(new GameEvent(ATS).card(card));
+        appendEvent(new GameEvent(ATS).card(card));
     }
 
     @Override
     public void removeFromSkirmish(PhysicalCard card) {
-        _events.add(new GameEvent(RFS).card(card));
+        appendEvent(new GameEvent(RFS).card(card));
     }
 
     @Override
     public void finishSkirmish() {
-        _events.add(new GameEvent(ES));
+        appendEvent(new GameEvent(ES));
     }
 
     @Override
     public void setCurrentPhase(String phase) {
-        _events.add(new GameEvent(GPC).phase(phase));
+        appendEvent(new GameEvent(GPC).phase(phase));
     }
 
     @Override
     public void cardCreated(PhysicalCard card) {
         if (card.getZone().isPublic() || (card.getZone().isVisibleByOwner() && card.getOwner().equals(_self)))
-            _events.add(new GameEvent(PCIP).card(card));
+            appendEvent(new GameEvent(PCIP).card(card));
     }
 
     @Override
     public void cardMoved(PhysicalCard card) {
-        _events.add(new GameEvent(MCIP).card(card));
+        appendEvent(new GameEvent(MCIP).card(card));
     }
 
     @Override
@@ -100,67 +105,67 @@ public class GameCommunicationChannel implements GameStateListener {
                 removedCardsVisibleByPlayer.add(card);
         }
         if (removedCardsVisibleByPlayer.size() > 0)
-            _events.add(new GameEvent(RCFP).otherCardIds(getCardIds(removedCardsVisibleByPlayer)).participantId(playerPerforming));
+            appendEvent(new GameEvent(RCFP).otherCardIds(getCardIds(removedCardsVisibleByPlayer)).participantId(playerPerforming));
     }
 
     @Override
     public void setPlayerPosition(String participant, int position) {
-        _events.add(new GameEvent(PP).participantId(participant).index(position));
+        appendEvent(new GameEvent(PP).participantId(participant).index(position));
     }
 
     @Override
     public void setTwilight(int twilightPool) {
-        _events.add(new GameEvent(TP).count(twilightPool));
+        appendEvent(new GameEvent(TP).count(twilightPool));
     }
 
     @Override
     public void setCurrentPlayerId(String currentPlayerId) {
-        _events.add(new GameEvent(TC).participantId(currentPlayerId));
+        appendEvent(new GameEvent(TC).participantId(currentPlayerId));
     }
 
     @Override
     public void addTokens(PhysicalCard card, Token token, int count) {
-        _events.add(new GameEvent(AT).card(card).token(token).count(count));
+        appendEvent(new GameEvent(AT).card(card).token(token).count(count));
     }
 
     @Override
     public void removeTokens(PhysicalCard card, Token token, int count) {
-        _events.add(new GameEvent(RT).card(card).token(token).count(count));
+        appendEvent(new GameEvent(RT).card(card).token(token).count(count));
     }
 
     @Override
     public void sendMessage(String message) {
-        _events.add(new GameEvent(M).message(message));
+        appendEvent(new GameEvent(M).message(message));
     }
 
     @Override
     public void setSite(PhysicalCard card) {
-        _events.add(new GameEvent(PCIP).card(card).index(card.getSiteNumber()));
+        appendEvent(new GameEvent(PCIP).card(card).index(card.getSiteNumber()));
     }
 
     @Override
     public void sendGameStats(GameStats gameStats) {
-        _events.add(new GameEvent(GS).gameStats(gameStats.makeACopy()));
+        appendEvent(new GameEvent(GS).gameStats(gameStats.makeACopy()));
     }
 
     @Override
     public void cardAffectedByCard(String playerPerforming, PhysicalCard card, Collection<PhysicalCard> affectedCards) {
-        _events.add(new GameEvent(CAC).card(card).participantId(playerPerforming).otherCardIds(getCardIds(affectedCards)));
+        appendEvent(new GameEvent(CAC).card(card).participantId(playerPerforming).otherCardIds(getCardIds(affectedCards)));
     }
 
     @Override
     public void eventPlayed(PhysicalCard card) {
-        _events.add(new GameEvent(EP).card(card));
+        appendEvent(new GameEvent(EP).card(card));
     }
 
     @Override
     public void cardActivated(String playerPerforming, PhysicalCard card) {
-        _events.add(new GameEvent(CA).card(card).participantId(playerPerforming));
+        appendEvent(new GameEvent(CA).card(card).participantId(playerPerforming));
     }
 
     public void decisionRequired(String playerId, AwaitingDecision decision) {
         if (playerId.equals(_self))
-            _events.add(new GameEvent(D).awaitingDecision(decision).participantId(playerId));
+            appendEvent(new GameEvent(D).awaitingDecision(decision).participantId(playerId));
     }
 
     public List<GameEvent> consumeGameEvents() {