diff --git a/soos-client/src/components/town/Town.tsx b/soos-client/src/components/town/Town.tsx
index a27cd1d..160725a 100644
--- a/soos-client/src/components/town/Town.tsx
+++ b/soos-client/src/components/town/Town.tsx
@@ -48,7 +48,7 @@ export const Town = (props: TownProps) => {
   let townSize = 10, points:string = "";
 
   let svg = null;
-  switch (gameTown.townLevel) {
+  switch (gameTown.townLevel + (premove?1:0)) {
   case 0:
   case 1:
     townSize = settlementSize;
@@ -85,7 +85,7 @@ export const Town = (props: TownProps) => {
   //   </svg >
   // );
 
-  svg = makeTownSVG(townSize,points,playerColor,highlighted);
+  svg = makeTownSVG(townSize,points,playerColor,highlighted||premove);
 
   const { x, y } = vertexCoordsToPixels(gameTown.coords!);
 
diff --git a/soos-client/src/features/gameView/GameView.tsx b/soos-client/src/features/gameView/GameView.tsx
index c83e45f..89c5a6d 100644
--- a/soos-client/src/features/gameView/GameView.tsx
+++ b/soos-client/src/features/gameView/GameView.tsx
@@ -75,12 +75,12 @@ export const GameView = (props: GameViewProps) => {
     socket.emit('playerId', receivePlayerId);
 
     socket.on('updateGameState', updateGameState);
-    socket.on('premoves', setPremoves);
+    socket.on('setPremoves', setPremoves);
 
     return () => {
       // socket.off("playerId", receivePlayerId);
       socket.off('updateGameState', updateGameState);
-      socket.off('premoves', setPremoves);
+      socket.off('setPremoves', setPremoves);
     };
   }, []);
 
@@ -105,8 +105,9 @@ export const GameView = (props: GameViewProps) => {
         resources={game.players[playerId].cards}
         closeWindowHandler={() => setIsTradeWindowShowing(false)}
         executeTradeHandler={(tradeIn: number, tradeFor: number) => {
-          game.executeTrade(tradeIn, tradeFor, playerId);
-          game.forceUpdate();
+          //game.executeTrade(tradeIn, tradeFor, playerId);
+          //game.forceUpdate();
+          socket.emit('trade',tradeIn,tradeFor);
         }}
       />,
     );
@@ -166,8 +167,9 @@ export const GameView = (props: GameViewProps) => {
 
         <button
           onClick={() => {
-            game.nextPlayer();
-            sendGameStateToServer();
+            //game.nextPlayer();
+            //sendGameStateToServer();
+            socket.emit('nextTurn');
           }}
           className="NextTurnButton"
           disabled={game.gamePhase !== GamePhase.MainGameplay}
diff --git a/soos-client/src/features/gameView/components/board/Board.tsx b/soos-client/src/features/gameView/components/board/Board.tsx
index 48f7603..7ccf144 100644
--- a/soos-client/src/features/gameView/components/board/Board.tsx
+++ b/soos-client/src/features/gameView/components/board/Board.tsx
@@ -88,12 +88,16 @@ export const Board = (props: BoardProps) => {
 
   let roadBuildActions = possibleBuildActions.filter(pba => pba.type === BuildActionType.Road);
 
-  if ((game.gamePhase === GamePhase.PlaceSettlement1 || game.gamePhase === GamePhase.PlaceSettlement2)
+  if (playerId!==undefined && ((game.gamePhase === GamePhase.PlaceSettlement1 || game.gamePhase === GamePhase.PlaceSettlement2)
     && game.currPlayerIdx === playerId
-    && game.claimedSettlement) {
+    && game.claimedSettlement) || makingPremoves) {
     // custom roadBuildActions for setup phase
     roadBuildActions = game.getValidBuildActions(playerId, BuildActionType.Road);
   }
+  for (const premoveAction of premoves){
+    if(premoveAction.type===BuildActionType.Road)
+      roadBuildActions.push(premoveAction);
+  }
 
   const roads = [];
   for (const road of game.map.roads) {
@@ -106,10 +110,14 @@ export const Board = (props: BoardProps) => {
       <Road
         gameRoad={road}
         highlighted={!!buildAction}
-        premove={makingPremoves && road.playerIdx === playerId}
+        premove={false && makingPremoves && road.playerIdx === playerId}
         onClick={() => {
           if (buildAction) {
-            socket.emit('build', buildAction);
+            if(makingPremoves){
+              socket.emit('premove', buildAction);
+            } else {
+              socket.emit('build', buildAction);
+            }
           }
         }}
         key={`r:${roadCoords.hexCoords.x},${roadCoords.hexCoords.y},${roadCoords.direction}`}
diff --git a/soos-gamelogic/src/game-map.ts b/soos-gamelogic/src/game-map.ts
index 48a62ac..118b634 100644
--- a/soos-gamelogic/src/game-map.ts
+++ b/soos-gamelogic/src/game-map.ts
@@ -309,7 +309,10 @@ export default class GameMap {
       return;
     }
     visitedVertices[vertexCoords.toString()] = true;
-
+    const vertTown = this.townAt(vertexCoords);
+    if(vertTown && !vertTown.isUnclaimed() &&vertTown.playerIdx && vertTown.playerIdx!== playerIdx){
+      return; // can't build past opponents towns!
+    }
     const egressRoads = this.getRoads(vertexCoords);
     for (const road of egressRoads) {
       // off edge of map
diff --git a/soos-gamelogic/src/game.ts b/soos-gamelogic/src/game.ts
index 44795db..f5cc789 100644
--- a/soos-gamelogic/src/game.ts
+++ b/soos-gamelogic/src/game.ts
@@ -274,7 +274,6 @@ export default class Game {
 
   actionViable(action: BuildActionType): boolean {
     //negative cost indicates any one resource less than requirement is an option
-    //TODO: implement ports eventually...
     let defaultReturnValue = true;
     for (const resource of AllResourceTypes) {
 
diff --git a/soos-server/src/routes/api/index.ts b/soos-server/src/routes/api/index.ts
index 03df26e..74ed30c 100644
--- a/soos-server/src/routes/api/index.ts
+++ b/soos-server/src/routes/api/index.ts
@@ -1,8 +1,8 @@
 import express from 'express';
 
-import { userApiRouter } from './user.js';
-import { socketApiRouter } from './socket.js';
-import { gameApiRouter } from './game.js';
+import { userApiRouter } from './serveruser.js';
+import { socketApiRouter } from './serversocket.js';
+import { gameApiRouter } from './servergame.js';
 
 const router = express.Router();
 
diff --git a/soos-server/src/routes/api/game.ts b/soos-server/src/routes/api/servergame.ts
similarity index 100%
rename from soos-server/src/routes/api/game.ts
rename to soos-server/src/routes/api/servergame.ts
diff --git a/soos-server/src/routes/api/socket.ts b/soos-server/src/routes/api/serversocket.ts
similarity index 100%
rename from soos-server/src/routes/api/socket.ts
rename to soos-server/src/routes/api/serversocket.ts
diff --git a/soos-server/src/routes/api/user.ts b/soos-server/src/routes/api/serveruser.ts
similarity index 100%
rename from soos-server/src/routes/api/user.ts
rename to soos-server/src/routes/api/serveruser.ts
diff --git a/soos-server/src/routes/socket-io/index.ts b/soos-server/src/routes/socket-io/index.ts
index dd66748..21d5d01 100644
--- a/soos-server/src/routes/socket-io/index.ts
+++ b/soos-server/src/routes/socket-io/index.ts
@@ -3,9 +3,9 @@ import { Socket, Server } from 'socket.io';
 import { Game } from 'soos-gamelogic';
 import ServerAction from '../../server-action.js';
 
-import { registerGeneralSocketListeners } from './general.js';
-import { registerLobbySocketListeners } from './lobby.js';
-import { registerGameSocketListeners } from './game.js';
+import { registerGeneralSocketListeners } from './servergeneral.js';
+import { registerLobbySocketListeners } from './serverlobby.js';
+import { registerGameSocketListeners } from './servergame.js';
 
 export const registerSocketListeners = (
   socket: Socket,
diff --git a/soos-server/src/routes/socket-io/game.ts b/soos-server/src/routes/socket-io/servergame.ts
similarity index 87%
rename from soos-server/src/routes/socket-io/game.ts
rename to soos-server/src/routes/socket-io/servergame.ts
index 78d4db6..aedd185 100644
--- a/soos-server/src/routes/socket-io/game.ts
+++ b/soos-server/src/routes/socket-io/servergame.ts
@@ -1,6 +1,6 @@
 import { Socket, Server } from 'socket.io';
 
-import { EdgeCoords, Game, gameFromString } from 'soos-gamelogic';
+import { AllResourceTypes, EdgeCoords, Game, ResourceType, gameFromString } from 'soos-gamelogic';
 import ServerAction from '../../server-action.js';
 import { BuildAction, hydrateBuildAction } from 'soos-gamelogic/dist/src/build-actions.js';
 import { gameManager, GameSlot } from '../../db/game-manager.js';
@@ -190,9 +190,29 @@ export const registerGameSocketListeners = (
     }
 
     saveGame(context);
-    socket.emit('premoves', gameMoves);
+    socket.emit('setPremoves', gameMoves);
   });
 
+  socket.on('nextTurn', ()=>{
+    if (!context) {
+      return new Error();
+    }
+    if(true){//context.playerIndex===context.game.currPlayerIdx){
+      context.game.nextPlayer();
+      saveGame(context);
+      io.to(context.activeGamecode).emit('updateGameState', context.game.toString());
+    }
+  });
+
+  socket.on('trade', (offer:ResourceType, target:ResourceType)=>{
+    if (!context) {
+      return new Error();
+    }
+    
+    context.game.executeTrade(offer,target,context.playerIndex);
+    saveGame(context);    
+    io.to(context.activeGamecode).emit('updateGameState', context.game.toString());
+  });
   /*This is never called, commenting out for now.
 
   socket.on('logPremoves', () => {
diff --git a/soos-server/src/routes/socket-io/general.ts b/soos-server/src/routes/socket-io/servergeneral.ts
similarity index 100%
rename from soos-server/src/routes/socket-io/general.ts
rename to soos-server/src/routes/socket-io/servergeneral.ts
diff --git a/soos-server/src/routes/socket-io/lobby.ts b/soos-server/src/routes/socket-io/serverlobby.ts
similarity index 100%
rename from soos-server/src/routes/socket-io/lobby.ts
rename to soos-server/src/routes/socket-io/serverlobby.ts