diff --git a/src/ship/ship.rs b/src/ship/ship.rs
index a02cb83..3cf36d9 100644
--- a/src/ship/ship.rs
+++ b/src/ship/ship.rs
@@ -75,7 +75,6 @@ struct ClientState {
     character: Character,
     session: Session,
     block: u32,
-    client_location: ClientLocation,
 }
 
 impl ClientState {
@@ -86,7 +85,6 @@ impl ClientState {
             character: Character::default(),
             session: Session::new(),
             block: 0,
-            client_location: ClientLocation::new(),
         }
     }
 }
@@ -95,6 +93,7 @@ impl ClientState {
 pub struct ShipServerState<EG: EntityGateway> {
     entity_gateway: EG,
     clients: HashMap<ClientId, ClientState>
+    client_location: ClientLocation,
 }
 
 impl<EG: EntityGateway> ShipServerState<EG> {
@@ -102,6 +101,7 @@ impl<EG: EntityGateway> ShipServerState<EG> {
         ShipServerState {
             entity_gateway: entity_gateway,
             clients: HashMap::new(),
+            client_location: ClientLocation::new(),
         }
     }