diff --git a/resources/[cars]/[boats]/MercuryVerado_350_white.png b/resources/[cars]/[boats]/MercuryVerado_350_white.png
deleted file mode 100644
index 9ff29f3f3..000000000
Binary files a/resources/[cars]/[boats]/MercuryVerado_350_white.png and /dev/null differ
diff --git a/resources/[cars]/[boats]/Yellowfin_42_Logos.png b/resources/[cars]/[boats]/Yellowfin_42_Logos.png
deleted file mode 100644
index 45b843b70..000000000
Binary files a/resources/[cars]/[boats]/Yellowfin_42_Logos.png and /dev/null differ
diff --git a/resources/[cars]/[boats]/nagasaki_navigator/carvariations.meta b/resources/[cars]/[boats]/nagasaki_navigator/carvariations.meta
new file mode 100644
index 000000000..a608f9a33
--- /dev/null
+++ b/resources/[cars]/[boats]/nagasaki_navigator/carvariations.meta
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<CVehicleModelInfoVariation>
+  <variationData> 
+    <Item>
+      <modelName>vd_boat</modelName>
+      <colors>
+        <Item>
+          <indices content="char_array">
+            0 
+            112
+            0 
+            0
+            0
+            0		
+          </indices>
+          <liveries>
+            <Item value="false" />
+            <Item value="false" />
+            <Item value="false" />
+            <Item value="false" />
+            <Item value="false" />
+            <Item value="false" />
+            <Item value="false" />
+            <Item value="false" />
+          </liveries>
+        </Item>		
+      </colors>
+      <kits>
+        <Item>0_default_modkit</Item>
+      </kits>
+      <windowsWithExposedEdges />
+      <plateProbabilities>
+        <Probabilities>
+          <Item>
+            <Name>Police guv plate</Name>
+            <Value value="100" />
+          </Item>
+        </Probabilities>
+      </plateProbabilities>
+      <lightSettings value="144" />
+      <sirenSettings value="1" />
+    </Item>
+  </variationData>
+</CVehicleModelInfoVariation>
\ No newline at end of file
diff --git a/resources/[cars]/[boats]/nagasaki_navigator/fxmanifest.lua b/resources/[cars]/[boats]/nagasaki_navigator/fxmanifest.lua
new file mode 100644
index 000000000..64704f61e
--- /dev/null
+++ b/resources/[cars]/[boats]/nagasaki_navigator/fxmanifest.lua
@@ -0,0 +1,24 @@
+fx_version "bodacious"
+
+games {"gta5"}
+
+lua54 'on' 
+
+client_script {
+	'tun_names.lua'
+}
+
+files {
+    'vehicles.meta',
+    'carvariations.meta',
+    'carcols.meta',
+    'handling.meta',
+    'vehiclelayouts.meta', 
+}
+
+data_file 'HANDLING_FILE' 'handling.meta'
+data_file 'VEHICLE_METADATA_FILE' 'vehicles.meta'
+data_file 'CARCOLS_FILE' 'carcols.meta'
+data_file 'VEHICLE_VARIATION_FILE' 'carvariations.meta'
+data_file 'VEHICLE_LAYOUTS_FILE' 'vehiclelayouts.meta'   
+
diff --git a/resources/[cars]/[boats]/nagasaki_navigator/handling.meta b/resources/[cars]/[boats]/nagasaki_navigator/handling.meta
new file mode 100644
index 000000000..84a83a15c
--- /dev/null
+++ b/resources/[cars]/[boats]/nagasaki_navigator/handling.meta
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<CHandlingDataMgr>
+  <HandlingData>
+	 <Item type="CHandlingData">
+      <handlingName>vd_boat</handlingName>
+      <fMass value="2500.000000" />
+      <fInitialDragCoeff value="1.000000" />
+      <fPercentSubmerged value="60.000000" />
+      <vecCentreOfMassOffset x="0.000000" y="-0.300000" z="-1.450000" />
+      <vecInertiaMultiplier x="1.000000" y="1.000000" z="1.000000" />
+      <fDriveBiasFront value="0.000000" />
+      <nInitialDriveGears value="1" />
+      <fInitialDriveForce value="15.50000" />
+      <fDriveInertia value="1.450000" />
+      <fClutchChangeRateScaleUpShift value="1.300000" />
+      <fClutchChangeRateScaleDownShift value="1.300000" />
+      <fInitialDriveMaxFlatVel value="150.000000" />
+      <fBrakeForce value="0.400000" />
+      <fBrakeBiasFront value="0.600000" />
+      <fHandBrakeForce value="0.700000" />
+      <fSteeringLock value="40.000000" />
+      <fTractionCurveMax value="0.000000" />
+      <fTractionCurveMin value="0.000000" />
+      <fTractionCurveLateral value="2.000000" />
+      <fTractionSpringDeltaMax value="0.100000" />
+      <fLowSpeedTractionLossMult value="0.000000" />
+      <fCamberStiffnesss value="0.000000" />
+      <fTractionBiasFront value="0.950000" />
+      <fTractionLossMult value="1.000000" />
+      <fSuspensionForce value="1.000000" />
+      <fSuspensionCompDamp value="3.000000" />
+      <fSuspensionReboundDamp value="0.000000" />
+      <fSuspensionUpperLimit value="0.100000" />
+      <fSuspensionLowerLimit value="0.100000" />
+      <fSuspensionRaise value="0.000000" />
+      <fSuspensionBiasFront value="0.000000" />
+      <fAntiRollBarForce value="0.000000" />
+      <fAntiRollBarBiasFront value="0.000000" />
+      <fRollCentreHeightFront value="0.000000" />
+      <fRollCentreHeightRear value="0.000000" />
+      <fCollisionDamageMult value="1.000000" />
+      <fWeaponDamageMult value="1.000000" />
+      <fDeformationDamageMult value="1.500000" />
+      <fEngineDamageMult value="1.500000" />
+      <fPetrolTankVolume value="2.000000" />
+      <fOilVolume value="3.000000" />
+      <fSeatOffsetDistX value="0.000000" />
+      <fSeatOffsetDistY value="0.000000" />
+      <fSeatOffsetDistZ value="0.000000" />
+      <nMonetaryValue value="40000" />
+      <strModelFlags>8000000</strModelFlags>
+      <strHandlingFlags>0</strHandlingFlags>
+      <strDamageFlags>20</strDamageFlags>
+      <AIHandling>AVERAGE</AIHandling>
+      <SubHandlingData>
+        <Item type="CBoatHandlingData">
+          <fBoxFrontMult value="0.900000" />
+          <fBoxRearMult value="0.700000" />
+          <fBoxSideMult value="0.900000" />
+          <fSampleTop value="0.120000" />
+          <fSampleBottom value="0.800000" />
+          <fAquaplaneForce value="1.600000" />
+          <fAquaplanePushWaterMult value="0.400000" />
+          <fAquaplanePushWaterCap value="3.500000" />
+          <fAquaplanePushWaterApply value="0.001250" />
+          <fRudderForce value="3.35000" />
+          <fRudderOffsetSubmerge value="0.000000" />
+          <fRudderOffsetForce value="0.000000" />
+          <fRudderOffsetForceZMult value="0.800000" />
+          <fWaveAudioMult value="4.000000" />
+          <vecMoveResistance x="20.000000" y="240.000000" z="200.000000" />
+          <vecTurnResistance x="2.750000" y="1.000000" z="0.010000" />
+          <fLook_L_R_CamHeight value="4.000000" />
+          <fDragCoefficient value="12.000000" />
+          <fKeelSphereSize value="0.000000" />
+          <fPropRadius value="0.200000" />
+          <fLowLodAngOffset value="0.03529852" />
+          <fLowLodDraughtOffset value="0.50544828" />
+          <fImpellerOffset value="0.600000" />
+          <fImpellerForceMult value="0.100000" />
+          <fDinghySphereBuoyConst value="0.000000" />
+          <fProwRaiseMult value="0.350000" />
+		  <fDeepWaterSampleBuoyancyMult value="4.0" />
+        </Item>
+        <Item type="CVehicleWeaponHandlingData">
+          <uWeaponHash>
+            <Item>VEHICLE_WEAPON_RADAR</Item>
+            <Item />
+            <Item />
+          </uWeaponHash>
+          <WeaponSeats content="int_array">
+            0 
+            0 
+            0 
+          </WeaponSeats>
+          <fTurretSpeed content="float_array">
+            0.000000	
+            0.000000	
+          </fTurretSpeed>
+          <fTurretPitchMin content="float_array">
+            0.000000	
+            0.000000	
+          </fTurretPitchMin>
+          <fTurretPitchMax content="float_array">
+            0.000000	
+            0.000000	
+          </fTurretPitchMax>
+          <fTurretCamPitchMin content="float_array">
+            0.000000	
+            0.000000	
+          </fTurretCamPitchMin>
+          <fTurretCamPitchMax content="float_array">
+            0.000000	
+            0.000000	
+          </fTurretCamPitchMax>
+          <fBulletVelocityForGravity content="float_array">
+            0.000000	
+            0.000000	
+          </fBulletVelocityForGravity>
+          <fTurretPitchForwardMin content="float_array">
+            0.000000	
+            0.000000	
+          </fTurretPitchForwardMin>
+          <fUvAnimationMult value="0.000000" />
+          <fMiscGadgetVar value="0.000000" />
+          <fWheelImpactOffset value="0.000000" />
+        </Item>
+        <Item type="NULL" />
+      </SubHandlingData>
+    </Item>
+  </HandlingData>
+</CHandlingDataMgr>
diff --git a/resources/[cars]/[boats]/nagasaki_navigator/stream/model/patrolboat_sign_1.dds b/resources/[cars]/[boats]/nagasaki_navigator/stream/model/patrolboat_sign_1.dds
new file mode 100644
index 000000000..b282b4fcd
Binary files /dev/null and b/resources/[cars]/[boats]/nagasaki_navigator/stream/model/patrolboat_sign_1.dds differ
diff --git a/resources/[cars]/[boats]/nagasaki_navigator/stream/model/vd_boat.yft b/resources/[cars]/[boats]/nagasaki_navigator/stream/model/vd_boat.yft
new file mode 100644
index 000000000..dd21dc1aa
Binary files /dev/null and b/resources/[cars]/[boats]/nagasaki_navigator/stream/model/vd_boat.yft differ
diff --git a/resources/[cars]/[boats]/nagasaki_navigator/stream/model/vd_boat.ytd b/resources/[cars]/[boats]/nagasaki_navigator/stream/model/vd_boat.ytd
new file mode 100644
index 000000000..0178c8e2b
Binary files /dev/null and b/resources/[cars]/[boats]/nagasaki_navigator/stream/model/vd_boat.ytd differ
diff --git a/resources/[cars]/[boats]/nagasaki_navigator/stream/model/vd_boat_hi.yft b/resources/[cars]/[boats]/nagasaki_navigator/stream/model/vd_boat_hi.yft
new file mode 100644
index 000000000..dd21dc1aa
Binary files /dev/null and b/resources/[cars]/[boats]/nagasaki_navigator/stream/model/vd_boat_hi.yft differ
diff --git a/resources/[cars]/[boats]/nagasaki_navigator/vehicles.meta b/resources/[cars]/[boats]/nagasaki_navigator/vehicles.meta
new file mode 100644
index 000000000..82aebec85
--- /dev/null
+++ b/resources/[cars]/[boats]/nagasaki_navigator/vehicles.meta
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CVehicleModelInfo__InitDataList>
+  <residentTxd>vehshare</residentTxd>
+  <residentAnims />
+  <InitDatas>
+    <Item>
+      <modelName>vd_boat</modelName>
+      <txdName>vd_boat</txdName>
+      <handlingId>vd_boat</handlingId>
+      <gameName>vd_boat</gameName>
+      <vehicleMakeName />
+      <expressionDictName>null</expressionDictName>
+      <expressionName>null</expressionName>
+      <animConvRoofDictName>null</animConvRoofDictName>
+      <animConvRoofName>null</animConvRoofName>
+      <animConvRoofWindowsAffected />
+      <ptfxAssetName>weap_ih_patrolboat</ptfxAssetName>
+      <audioNameHash />
+      <layout>LAYOUT_BOAT_PREDATOR</layout>
+      <coverBoundOffsets>STANDARD_COVER_OFFSET_INFO</coverBoundOffsets>
+      <explosionInfo>EXPLOSION_INFO_BOAT_MEDIUM</explosionInfo>
+      <scenarioLayout />
+      <cameraName>FOLLOW_BOAT_CAMERA</cameraName>
+      <aimCameraName>BOAT_AIM_CAMERA</aimCameraName>
+      <bonnetCameraName>BOAT_BONNET_CAMERA</bonnetCameraName>
+      <povCameraName>DEFAULT_POV_CAMERA_LOOKAROUND</povCameraName>
+      <povTurretCameraName>POV_TURRET_CAMERA_PATROLBOAT_FRONT</povTurretCameraName>
+      <FirstPersonDriveByIKOffset x="0.030000" y="-0.010000" z="-0.030000" />
+      <FirstPersonDriveByUnarmedIKOffset x="0.000000" y="0.000000" z="0.000000" />
+      <FirstPersonProjectileDriveByIKOffset x="0.000000" y="0.000000" z="-0.050000" />
+      <FirstPersonProjectileDriveByPassengerIKOffset x="0.000000" y="0.000000" z="-0.050000" />
+      <FirstPersonProjectileDriveByRearLeftIKOffset x="0.000000" y="0.000000" z="-0.063000" />
+      <FirstPersonProjectileDriveByRearRightIKOffset x="0.000000" y="0.000000" z="-0.063000" />
+      <FirstPersonDriveByLeftPassengerIKOffset x="-0.030000" y="0.015000" z="-0.046000" />
+      <FirstPersonDriveByRightPassengerIKOffset x="0.040000" y="0.000000" z="-0.030000" />
+      <FirstPersonDriveByRightRearPassengerIKOffset x="0.033000" y="0.020000" z="-0.070000" />
+      <FirstPersonDriveByLeftPassengerUnarmedIKOffset x="0.000000" y="0.000000" z="0.000000" />
+      <FirstPersonDriveByRightPassengerUnarmedIKOffset x="0.000000" y="0.000000" z="0.000000" />
+      <FirstPersonMobilePhoneOffset x="0.155000" y="0.315000" z="0.643000" />
+      <FirstPersonPassengerMobilePhoneOffset x="0.113000" y="0.450000" z="0.503000" />
+      <FirstPersonMobilePhoneSeatIKOffset>
+        <Item>
+            <Offset x="0.113000" y="0.450000" z="0.596000" />
+            <SeatIndex value="2" />
+        </Item>
+        <Item>
+            <Offset x="0.113000" y="0.450000" z="0.596000" />
+            <SeatIndex value="3" />
+        </Item>
+      </FirstPersonMobilePhoneSeatIKOffset>
+      <PovCameraOffset x="0.000000" y="-0.050000" z="0.885000" />
+      <PovCameraVerticalAdjustmentForRollCage value="-0.045000" />
+      <PovPassengerCameraOffset x="0.000000" y="0.100000" z="-0.100000" />
+      <PovRearPassengerCameraOffset x="0.000000" y="0.000000" z="0.000000" />
+      <vfxInfoName>VFXVEHICLEINFO_BOAT_GENERIC</vfxInfoName>
+      <shouldUseCinematicViewMode value="true" />
+      <shouldCameraTransitionOnClimbUpDown value="false" />
+      <shouldCameraIgnoreExiting value="false" />
+      <AllowPretendOccupants value="true" />
+      <AllowJoyriding value="true" />
+      <AllowSundayDriving value="true" />
+      <AllowBodyColorMapping value="true" />
+      <wheelScale value="0.500000" />
+      <wheelScaleRear value="0.500000" />
+      <dirtLevelMin value="0.000000" />
+      <dirtLevelMax value="0.000000" />
+      <envEffScaleMin value="0.000000" />
+      <envEffScaleMax value="1.000000" />
+      <envEffScaleMin2 value="0.000000" />
+      <envEffScaleMax2 value="1.000000" />
+      <damageMapScale value="0.600000" />
+      <damageOffsetScale value="1.000000" />
+      <diffuseTint value="0x00FFFFFF" />
+      <steerWheelMult value="1.000000" />
+      <HDTextureDist value="5.000000" />
+      <lodDistances content="float_array">
+        500.000000
+        500.000000
+        500.000000
+        500.000000
+        500.000000
+        500.000000
+      </lodDistances>
+      <minSeatHeight value="0.922" />
+      <identicalModelSpawnDistance value="20" />
+      <maxNumOfSameColor value="10" />
+      <defaultBodyHealth value="1000.000000" />
+      <pretendOccupantsScale value="1.000000" />
+      <visibleSpawnDistScale value="1.000000" />
+      <trackerPathWidth value="2.000000" />
+      <weaponForceMult value="1.000000" />
+      <frequency value="100" />
+      <swankness>SWANKNESS_3</swankness>
+      <maxNum value="999" />
+      <flags>FLAG_EXTRAS_STRONG FLAG_EXTRAS_ALL FLAG_HAS_LIVERY FLAG_NO_BOOT FLAG_PEDS_CAN_STAND_ON_TOP FLAG_GEN_NAVMESH FLAG_LAW_ENFORCEMENT FLAG_DONT_SPAWN_IN_CARGEN FLAG_HEADLIGHTS_USE_ACTUAL_BONE_POS FLAG_DONT_SPAWN_AS_AMBIENT FLAG_HAS_TURRET_SEAT_ON_VEHICLE FLAG_PREFER_ENTER_TURRET_AFTER_DRIVER FLAG_RESET_TURRET_SEAT_HEADING FLAG_USE_TURRET_RELATIVE_AIM_CALCULATION FLAG_DISABLE_DEFORMATION FLAG_CHECK_IF_DRIVER_SEAT_IS_CLOSER_THAN_TURRETS_WITH_ON_BOARD_ENTER</flags>
+      <type>VEHICLE_TYPE_BOAT</type>
+      <plateType>VPT_NONE</plateType>
+      <dashboardType>VDT_TRUCK</dashboardType>
+      <vehicleClass>VC_BOAT</vehicleClass>
+      <wheelType>VWT_SPORT</wheelType>
+      <trailers />
+      <additionalTrailers />
+      <drivers>
+        <Item>
+          <driverName>S_M_Y_USCG_01</driverName>
+          <npcName />
+        </Item>
+      </drivers>
+      <extraIncludes />
+      <doorsWithCollisionWhenClosed />
+      <driveableDoors />
+      <bumpersNeedToCollideWithMap value="false" />
+      <needsRopeTexture value="false" />
+      <requiredExtras />
+      <rewards>
+        <Item>REWARD_WEAPON_CARBINERIFLE</Item>
+        <Item>REWARD_AMMO_CARBINERIFLE</Item>
+        <Item>REWARD_STAT_WEAPON</Item>
+      </rewards>
+      <cinematicPartCamera>
+        <Item>VEH_WINDOW_FRONT_LEFT_CAMERA</Item>
+        <Item>VEH_WINDOW_FRONT_RIGHT_CAMERA</Item>
+      </cinematicPartCamera>
+      <NmBraceOverrideSet />
+      <buoyancySphereOffset x="0.000000" y="0.000000" z="0.000000" />
+      <buoyancySphereSizeScale value="1.000000" />
+      <pOverrideRagdollThreshold type="NULL" />
+      <firstPersonDrivebyData>
+        <Item>BOAT_PATROLBOAT_FRONT_LEFT</Item>
+        <Item>BOAT_PATROLBOAT_FRONT_RIGHT</Item>
+      </firstPersonDrivebyData>
+    </Item>
+  </InitDatas>
+  <txdRelationships>
+    <Item>
+      <parent>vehshare_truck</parent>
+      <child>vd_boat</child>
+    </Item>
+  </txdRelationships>
+</CVehicleModelInfo__InitDataList>
diff --git a/resources/[cars]/[boats]/yellowf_sign_1.png b/resources/[cars]/[boats]/yellowf_sign_1.png
deleted file mode 100644
index ba23d9edc..000000000
Binary files a/resources/[cars]/[boats]/yellowf_sign_1.png and /dev/null differ
diff --git a/resources/[cars]/[boats]/yellowf_sign_4.png b/resources/[cars]/[boats]/yellowf_sign_4.png
deleted file mode 100644
index ce6cb41d7..000000000
Binary files a/resources/[cars]/[boats]/yellowf_sign_4.png and /dev/null differ
diff --git a/resources/[cars]/[boats]/yellowf_sign_6.png b/resources/[cars]/[boats]/yellowf_sign_6.png
deleted file mode 100644
index b054f8a0a..000000000
Binary files a/resources/[cars]/[boats]/yellowf_sign_6.png and /dev/null differ