diff --git a/lib/types/building.ts b/lib/types/building.ts
index 53c6b33..44271ef 100644
--- a/lib/types/building.ts
+++ b/lib/types/building.ts
@@ -35,13 +35,13 @@ export interface Building {
 
   downgrade: {
     can: number;
-    reason: any[];
+    reason: [number, string];
     image: string;
   };
 
   upgrade: {
     can: number;
-    reason: any[];
+    reason: [number, string];
 
     cost: {
       food: number;
diff --git a/lib/types/space-port.ts b/lib/types/space-port.ts
index 1e7b8d8..6846fa6 100644
--- a/lib/types/space-port.ts
+++ b/lib/types/space-port.ts
@@ -20,66 +20,24 @@ export type Filter = {
 };
 
 export type Ship = {
-  task: string;
   id: number;
-  quantity: number;
-  date_arrives?: ServerDate;
-  reason?: { 0: number; 1: string };
-
-  to?: {
-    name: string;
-    id: number;
-    type: string;
-    owner: string;
-    x: number;
-    y: number;
-    empire: {
-      id: number;
-      name: string;
-    };
-  };
-
-  from?: {
-    name: string;
-    id: number;
-    type: string;
-    owner: string;
-    x: number;
-    y: number;
-    empire: {
-      id: number;
-      name: string;
-    };
-  };
-
-  details: {
-    hold_size: number;
-    combat: number;
-    efficiency: number;
-    speed: number;
-    date_started: ServerDate;
-    max_occupants: number;
-    date_available: ServerDate;
-    mark: string;
-    berth_level: number;
-    can_rename: IntBool;
-    name: string;
-    stealth: number;
-    type: string;
-    build_tags: string[];
-    can_recall: IntBool;
-    payload: any;
-    type_human: string;
-    can_scuttle: IntBool;
-  };
-
-  earliest_arrival?: {
-    month: number;
-    day: number;
-    hour: number;
-    minute: number;
-    second: number;
-  };
+  name: string;
+  type: string;
+  type_human: string;
+  task: string;
+  speed: number;
+  fleet_speed: number;
+  stealth: number;
+  hold_size: number;
+  berth_level: number;
+  date_started: ServerDate;
+  date_available: ServerDate;
+  date_arrives: ServerDate;
+  can_recall: IntBool;
+  can_scuttle: IntBool;
+  from?: ShipPoint;
+  to?: ShipPoint;
+  orbiting?: ShipPoint;
 };
 
 export interface ViewAllShipsParams {
@@ -124,7 +82,7 @@ export interface ViewForeignShipsResponse {
   number_of_ships: number;
 }
 
-export type FleetPoint = {
+export type ShipPoint = {
   id: number;
   type: 'body' | 'star';
   name: string;
@@ -133,27 +91,6 @@ export type FleetPoint = {
   empire?: { id: number; name: string };
 };
 
-export type FleetShip = {
-  id: number;
-  name: string;
-  type: string;
-  type_human: string;
-  task: string;
-  speed: number;
-  fleet_speed: number;
-  stealth: number;
-  hold_size: number;
-  berth_level: number;
-  date_started: ServerDate;
-  date_available: ServerDate;
-  date_arrives: ServerDate;
-  can_recall: IntBool;
-  can_scuttle: IntBool;
-  from?: FleetPoint;
-  to?: FleetPoint;
-  orbiting?: FleetPoint;
-};
-
 export interface GetFleetForParams {
   from_body_id: number;
   target: Target;
@@ -179,10 +116,10 @@ export interface GetShipsForParams {
 }
 
 export interface GetShipsForResponse {
-  incoming: FleetShip[];
-  available: FleetShip[];
-  unavailable: Array<{ reason: any[]; ship: FleetShip }>;
-  orbiting: FleetShip[];
+  incoming: Ship[];
+  available: Ship[];
+  unavailable: Array<{ reason: [number, string]; ship: Ship }>;
+  orbiting: Ship[];
   mining_platforms?: Array<{ empire_id: number; empire_name: string }>;
   fleet_send_limit: number;
 }
@@ -218,7 +155,8 @@ export interface SendFleetParams {
 }
 
 export interface SendFleetResponse {
-  fleet: FleetShip[];
+  // TODO - I don't think this is right but it's outside of what I'm testing right now
+  fleet: Ship[];
 }
 
 export interface RecallShipParams {
@@ -227,7 +165,7 @@ export interface RecallShipParams {
 }
 
 export interface RecallShipResponse {
-  ship: FleetShip;
+  ship: Ship;
 }
 
 export interface RecallAllParams {
@@ -235,7 +173,7 @@ export interface RecallAllParams {
 }
 
 export interface RecallAllResponse {
-  ships: FleetShip[];
+  ships: Ship[];
 }
 
 export interface NameShipParams {
@@ -273,7 +211,7 @@ export interface PrepareSendSpiesParams {
 }
 
 export interface PrepareSendSpiesResponse {
-  ships: FleetShip[];
+  ships: Ship[];
   spies: Spy[];
 }
 
@@ -285,7 +223,7 @@ export interface SendSpiesParams {
 }
 
 export interface SendSpiesResponse {
-  ship: FleetShip;
+  ship: Ship;
   spies_sent: number[];
   spies_not_sent: number[];
 }
@@ -296,7 +234,7 @@ export interface PrepareFetchSpiesParams {
 }
 
 export interface PrepareFetchSpiesResponse {
-  ships: FleetShip[];
+  ships: Ship[];
   spies: Spy[];
 }
 
@@ -308,7 +246,7 @@ export interface FetchSpiesParams {
 }
 
 export interface FetchSpiesResponse {
-  ship: FleetShip;
+  ship: Ship;
 }
 
 export interface ViewBattleLogsParams {