diff --git a/src/AltV/Entities/AtlasVehicleBase.cs b/src/AltV/Entities/AtlasVehicleBase.cs
index c548912..953843e 100644
--- a/src/AltV/Entities/AtlasVehicleBase.cs
+++ b/src/AltV/Entities/AtlasVehicleBase.cs
@@ -1,20 +1,18 @@
 using AltV.Atlas.Vehicles.AltV.Interfaces;
 using AltV.Net;
 using AltV.Net.Async.Elements.Entities;
-using AltV.Net.Data;
 using AltV.Net.Elements.Entities;
 
 namespace AltV.Atlas.Vehicles.AltV.Entities;
 
-public class AtlasVehicleBase : AsyncVehicle, IAtlasVehicle
+public class AtlasVehicleBase( ICore core, IntPtr nativePointer, uint id ) : AsyncVehicle( core, nativePointer, id ), IAtlasVehicle
 {
-    public uint Fuel => CalculateFuel( );
     public uint VehicleId { get; set; }
 
-    public AtlasVehicleBase( ICore core, IntPtr nativePointer, uint id ) : base( core, nativePointer, id )
-    {
-    }
-
+    /// <summary>
+    /// Forces the player out of the vehicle
+    /// </summary>
+    /// <param name="player">The player to force out</param>
     public void WarpOutOfVehicle( IPlayer player )
     {
         var isInVehicle = Passengers.Any( s => s.Player == player );
@@ -33,9 +31,4 @@ public bool LockVehicle( IPlayer player )
     {
         return false;
     }
-
-    private uint CalculateFuel( )
-    {
-        return 1;
-    }
 }
\ No newline at end of file
diff --git a/src/AltV/Interfaces/IAtlasVehicle.cs b/src/AltV/Interfaces/IAtlasVehicle.cs
index 9043a14..4562ac0 100644
--- a/src/AltV/Interfaces/IAtlasVehicle.cs
+++ b/src/AltV/Interfaces/IAtlasVehicle.cs
@@ -5,7 +5,6 @@ namespace AltV.Atlas.Vehicles.AltV.Interfaces;
 
 public interface IAtlasVehicle : IVehicle
 {
-    uint Fuel { get; }
     uint VehicleId { get; set; }
     void WarpOutOfVehicle( IPlayer player );
     bool LockVehicle( object item );
diff --git a/src/Entities/AtlasTuningVehicle.cs b/src/Entities/AtlasTuningVehicle.cs
index e5ef94a..be531c4 100644
--- a/src/Entities/AtlasTuningVehicle.cs
+++ b/src/Entities/AtlasTuningVehicle.cs
@@ -1,71 +1,160 @@
 using AltV.Atlas.Vehicles.AltV.Entities;
+using AltV.Atlas.Vehicles.Enums;
+using AltV.Atlas.Vehicles.Models;
+using AltV.Atlas.Vehicles.Utils;
 using AltV.Net;
+using AltV.Net.Data;
+using AltV.Net.Enums;
 
 namespace AltV.Atlas.Vehicles.Entities;
 
 public class AtlasTuningVehicle : AtlasVehicleBase
 {
+    /// <summary>
+    /// Creates an AtlasTuningVehicle
+    /// </summary>
+    /// <param name="core">AltV core</param>
+    /// <param name="nativePointer">AltV nativePointer</param>
+    /// <param name="id">Id of the ped</param>
     public AtlasTuningVehicle( ICore core, IntPtr nativePointer, uint id ) : base( core, nativePointer, id )
     {
+        ModKit = 1;
+        NumberplateText = "ATLAS";
+        SetPrimaryRgb( "#1a222e" );
+        SetSecondaryRgb( "#15dbfc" );
+        SetPearlColor( EGtaColor.MatteBlack );
     }
+    /// <summary>
+    /// All installed vehicle mods
+    /// </summary>
+    public List<VehicleMod> InstalledMods { get; } = new( );
+    /// <summary>
+    /// The primary color material
+    /// </summary>
+    public EColorMaterial PrimaryColorMaterial { get; private set; } = EColorMaterial.DefaultAlloy;
+    /// <summary>
+    /// The secondary color material
+    /// </summary>
+    public EColorMaterial SecondaryColorMaterial { get; private set; } = EColorMaterial.DefaultAlloy;
 
-    // public List<VehicleMod> InstalledMods { get; } = new( );
-    // public EColorMaterial PrimaryColorMaterial { get; private set; } = EColorMaterial.DefaultAlloy;
-    // public EColorMaterial SecondaryColorMaterial { get; private set; } = EColorMaterial.DefaultAlloy;
-
-    // public void SetPrimaryMaterial( EColorMaterial material )
-    // {
-    //     var oldColor = PrimaryColorRgb;
-    //     PrimaryColor = ( byte ) material;
-    //     PrimaryColorRgb = oldColor;
-    // }
-    //
-    // public void SetSecondaryMaterial( EColorMaterial material )
-    // {
-    //     var oldColor = PrimaryColorRgb;
-    //     PrimaryColor = ( byte ) material;
-    //     PrimaryColorRgb = oldColor;
-    // }
-    //
-    // public void SetPrimaryRgb( string rgb )
-    // {
-    //     if( !rgb.TryParseRgb( out var color ) )
-    //         return;
-    //
-    //     PrimaryColorRgb = new Rgba( color.R, color.G, color.B, color.A );
-    // }
-    //
-    // public void SetSecondaryRgb( string rgb )
-    // {
-    //     if( !rgb.TryParseRgb( out var color ) )
-    //         return;
-    //
-    //     SecondaryColorRgb = new Rgba( color.R, color.G, color.B, color.A );
-    // }
-    //
-    // public bool InstallMod( VehicleMod vehicleMod, bool force = false )
-    // {
-    //     var maxIndex = GetModsCount( ( byte ) vehicleMod.ModType );
-    //
-    //     if( vehicleMod.Index > maxIndex && !force )
-    //     {
-    //         return false;
-    //     }
-    //
-    //     var result = SetMod( ( byte ) vehicleMod.ModType, ( byte ) vehicleMod.Index );
-    //     InstalledMods.Add( vehicleMod );
-    //     return result;
-    // }
-    //
-    // public IEnumerable<( VehicleMod mod, bool result )> InstallMods( IEnumerable<VehicleMod> vehicleMods )
-    // {
-    //     return ( from vehicleMod in vehicleMods let result = InstallMod( vehicleMod ) select ( vehicleMod, result ) ).ToList( );
-    // }
-    //
-    // public bool RemoveMod( VehicleModType vehicleModType )
-    // {
-    //     var result = SetMod( ( byte ) vehicleModType, 0 );
-    //     InstalledMods.RemoveAll( x => x.ModType == vehicleModType );
-    //     return result;
-    // }
+    /// <summary>
+    /// Sets the PrimaryMaterial of the vehicle
+    /// A list of all available Materials can be found in the EColorMaterial Enum
+    /// </summary>
+    /// <param name="material">The material to apply</param>
+    public void SetPrimaryMaterial( EColorMaterial material )
+    {
+        var oldColor = PrimaryColorRgb;
+        PrimaryColor = ( byte ) material;
+        PrimaryColorRgb = oldColor;
+    }
+
+    /// <summary>
+    /// Sets the SecondaryMaterial of the vehicle
+    /// A list of all available Materials can be found in the EColorMaterial Enum
+    /// </summary>
+    /// <param name="material">The material to apply</param>
+    public void SetSecondaryMaterial( EColorMaterial material )
+    {
+        var oldColor = PrimaryColorRgb;
+        PrimaryColor = ( byte ) material;
+        PrimaryColorRgb = oldColor;
+    }
+
+    /// <summary>
+    /// Sets the vehicle PrimaryColorRgb from a string
+    /// </summary>
+    /// <param name="rgb"></param>
+    public void SetPrimaryRgb( string rgb )
+    {
+        if( !rgb.TryParseRgb( out var color ) )
+            return;
+
+        PrimaryColorRgb = new Rgba( color.R, color.G, color.B, color.A );
+    }
+
+    /// <summary>
+    /// Sets the vehicle SecondaryColorRgb from a string
+    /// </summary>
+    /// <param name="rgb"></param>
+    public void SetSecondaryRgb( string rgb )
+    {
+        if( !rgb.TryParseRgb( out var color ) )
+            return;
+
+        SecondaryColorRgb = new Rgba( color.R, color.G, color.B, color.A );
+    }
+
+    /// <summary>
+    /// Sets the vehicle PearlColor from a EGtaColor
+    /// </summary>
+    /// <param name="color"></param>
+    public void SetPearlColor( EGtaColor color ) => PearlColor = ( byte ) color;
+
+    /// <summary>
+    /// Installs a given VehicleMod
+    /// </summary>
+    /// <param name="vehicleMod">The mod to install</param>
+    /// <param name="force">Force the mod index even if it should not exist</param>
+    /// <returns>Returns if the SetMod was successful</returns>
+    public bool InstallMod( VehicleMod vehicleMod, bool force = false )
+    {
+        var maxIndex = GetModsCount( ( byte ) vehicleMod.ModType );
+
+        if( vehicleMod.Index > maxIndex && !force )
+        {
+            return false;
+        }
+
+        var result = SetMod( ( byte ) vehicleMod.ModType, ( byte ) vehicleMod.Index );
+
+        if( result )
+            InstalledMods.Add( vehicleMod );
+
+        return result;
+    }
+
+    /// <summary>
+    /// Installs a list of mods
+    /// </summary>
+    /// <param name="vehicleMods">The list of mods to install</param>
+    /// <returns>Returns a list of tuples with the given mod and the SetMod result</returns>
+    public IEnumerable<( VehicleMod mod, bool result )> InstallMods( IEnumerable<VehicleMod> vehicleMods )
+    {
+        return ( from vehicleMod in vehicleMods let result = InstallMod( vehicleMod ) select ( vehicleMod, result ) ).ToList( );
+    }
+
+    /// <summary>
+    /// Removes the given VehicleModType
+    /// </summary>
+    /// <param name="vehicleModType">The type to remove</param>
+    /// <returns>Returns the SetMod result or false if the mod wasn't installed</returns>
+    public bool RemoveMod( VehicleModType vehicleModType )
+    {
+        if( InstalledMods.All( mod => mod.ModType != vehicleModType ) )
+            return false;
+
+        var result = SetMod( ( byte ) vehicleModType, 0 );
+        InstalledMods.RemoveAll( x => x.ModType == vehicleModType );
+        return result;
+    }
+
+    /// <summary>
+    /// Removes all installed vehicleMods
+    /// </summary>
+    /// <returns>Returns a list of tuples with the given mod and the SetMod result</returns>
+    public IEnumerable<( VehicleMod mod, bool result )> RemoveMods( )
+    {
+        return ( from vehicleMod in InstalledMods.ToList( ) let result = RemoveMod( vehicleMod.ModType ) select ( vehicleMod, result ) ).ToList( );
+    }
+
+    /// <summary>
+    /// Removes all given vehicleMods
+    /// </summary>
+    /// <param name="vehicleMods"></param>
+    /// <returns>Returns a list of tuples with the given mod and the SetMod result</returns>
+    public IEnumerable<( VehicleMod mod, bool result )> RemoveMods( IEnumerable<VehicleMod> vehicleMods )
+    {
+        return ( from vehicleMod in vehicleMods.ToList( ) let result = RemoveMod( vehicleMod.ModType ) select ( vehicleMod, result ) ).ToList( );
+    }
 }
\ No newline at end of file
diff --git a/src/Factories/AtlasVehicleFactory.cs b/src/Factories/AtlasVehicleFactory.cs
index 89bacef..f8f267d 100644
--- a/src/Factories/AtlasVehicleFactory.cs
+++ b/src/Factories/AtlasVehicleFactory.cs
@@ -34,7 +34,6 @@ public AtlasVehicleFactory( ILogger<AtlasVehicleFactory> logger, IServiceProvide
     /// <summary>
     /// Create a new vehicle of type T
     /// </summary>
-    /// <param name="vehicleId"></param>
     /// <param name="model">The model of the vehicle</param>
     /// <param name="position">The position to spawn the vehicle at</param>
     /// <param name="rotation">The rotation to spawn the vehicle at</param>
diff --git a/src/Models/VehicleMod.cs b/src/Models/VehicleMod.cs
index bf3b22b..23cffd4 100644
--- a/src/Models/VehicleMod.cs
+++ b/src/Models/VehicleMod.cs
@@ -3,23 +3,14 @@ namespace AltV.Atlas.Vehicles.Models;
 
 public class VehicleMod
 {
-    /// <summary>
-    /// Constructor to create a VehicleMod
-    /// </summary>
-    /// <param name="vehicleModType">The type of the mod</param>
-    /// <param name="index">The index of the mod</param>
-    public VehicleMod( VehicleModType vehicleModType, uint index )
-    {
-        ModType = vehicleModType;
-        Index = index;
-    }
     /// <summary>
     /// Type of the vehicle mod
     /// </summary>
-    public VehicleModType ModType { get; set; }
+    public VehicleModType ModType { get; init; }
 
     /// <summary>
     /// Index of the vehicle mod
     /// </summary>
-    public uint Index { get; set; }
+    public uint Index { get; init; }
+
 }
\ No newline at end of file