diff --git a/Stars Assistant/CSV/Fleet.cs b/Stars Assistant/CSV/Fleet.cs
new file mode 100644
index 0000000..4f4b9e7
--- /dev/null
+++ b/Stars Assistant/CSV/Fleet.cs	
@@ -0,0 +1,95 @@
+using System;
+using CsvHelper.Configuration.Attributes;
+
+namespace StarsAssistant.CSV;
+
+public class Fleet
+{
+    [Index(0)]
+    public string FleetName { get; set; } = String.Empty;
+
+    [Index(1)]
+    public int X { get; set; }
+
+    [Index(2)]
+    public int Y { get; set; }
+
+    [Index(3)]
+    public string Planet { get; set; } = String.Empty;
+
+    [Index(4)]
+    public string Destination { get; set; } = String.Empty;
+
+    [Index(5)]
+    public string BattlePlan { get; set; } = String.Empty;
+
+    [Index(6)]
+    public int ShipCount { get; set; }
+
+    [Index(7)]
+    public int Ironium { get; set; }
+
+    [Index(8)]
+    public int Boranium { get; set; }
+
+    [Index(9)]
+    public int Germanium { get; set; }
+
+    [Index(0)]
+    public int Colonists { get; set; }
+
+    [Index(1)]
+    public int Fuel { get; set; }
+
+    [Index(2)]
+    public int OwnerPlayerNumber { get; set; }
+
+    [Index(3)]
+    public int ETA { get; set; }
+
+    [Index(4)]
+    public int Warp { get; set; }
+
+    [Index(5)]
+    public int Mass { get; set; }
+
+    [Index(6)]
+    public int Cloak { get; set; }
+
+    [Index(7)]
+    public int Scan { get; set; }
+
+    [Index(8)]
+    public int PenScan { get; set; }
+
+    [Index(9)]
+    public string Task { get; set; } = String.Empty;
+
+    [Index(0)]
+    public int Mining { get; set; }
+
+    [Index(1)]
+    public int Sweep { get; set; }
+
+    [Index(2)]
+    public int Laying { get; set; }
+
+    [Index(3)]
+    public int Terraforming { get; set; }
+
+    [Index(4)]
+    public int Unarmed { get; set; }
+
+    [Index(5)]
+    public int Scout { get; set; }
+
+    [Index(6)]
+    public int Warship { get; set; }
+
+    [Index(7)]
+    public int Utility { get; set; }
+
+    [Index(8)]
+    public int Bomber { get; set; }
+
+}
\ No newline at end of file
diff --git a/Stars Assistant/CSV/Planet.cs b/Stars Assistant/CSV/Planet.cs
index ebbed8e..dc8b9c4 100644
--- a/Stars Assistant/CSV/Planet.cs	
+++ b/Stars Assistant/CSV/Planet.cs	
@@ -1,5 +1,4 @@
-using System.ComponentModel.DataAnnotations;
-using System.Globalization;
+using System.Globalization;
 using CsvHelper.Configuration.Attributes;
 
 namespace StarsAssistant.CSV;
diff --git a/Stars Assistant/Model/Fleet.cs b/Stars Assistant/Model/Fleet.cs
new file mode 100644
index 0000000..ee46f59
--- /dev/null
+++ b/Stars Assistant/Model/Fleet.cs	
@@ -0,0 +1,69 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace StarsAssistant.Model;
+
+public class Fleet
+{    
+    #region Persistant propeties (from Stars)
+
+    public string FleetName { get; set; } = String.Empty;
+
+    public int X { get; set; }
+
+    public int Y { get; set; }
+
+    public string Planet { get; set; } = String.Empty;
+
+    public string Destination { get; set; } = String.Empty;
+
+    public string BattlePlan { get; set; } = String.Empty;
+
+    public int ShipCount { get; set; }
+
+    public int Ironium { get; set; }
+
+    public int Boranium { get; set; }
+
+    public int Germanium { get; set; }
+
+    public int Colonists { get; set; }
+
+    public int Fuel { get; set; }
+
+    public int OwnerPlayerNumber { get; set; }
+
+    public int ETA { get; set; }
+
+    public int Warp { get; set; }
+
+    public int Mass { get; set; }
+
+    public int Cloak { get; set; }
+
+    public int Scan { get; set; }
+
+    public int PenScan { get; set; }
+
+    public string Task { get; set; } = String.Empty;
+
+    public int Mining { get; set; }
+
+    public int Sweep { get; set; }
+
+    public int Laying { get; set; }
+
+    public int Terraforming { get; set; }
+
+    public int Unarmed { get; set; }
+
+    public int Scout { get; set; }
+
+    public int Warship { get; set; }
+
+    public int Utility { get; set; }
+
+    public int Bomber { get; set; }
+
+    #endregion
+}