diff --git a/DATA/COCKPITS/heavylifter.ini b/DATA/COCKPITS/heavylifter.ini
new file mode 100644
index 00000000..3069869b
--- /dev/null
+++ b/DATA/COCKPITS/heavylifter.ini
@@ -0,0 +1,16 @@
+[Cockpit]
+mesh = cockpits\bretonia\models\br_elite_cockpit.cmp
+int_brightness = 0.500000
+head_turn = 40, 50
+
+[CockpitCamera]
+
+
+[TurretCamera]
+tether = 0.000000, 20, 140
+yaw_rotate_speed = 2.250000
+pitch_rotate_speed = 1.500000
+accel_speed = 5
+
+[RearViewCamera]
+view_position = 0, 40, 160
\ No newline at end of file
diff --git a/DATA/EQUIPMENT/engine_equip.ini b/DATA/EQUIPMENT/engine_equip.ini
index 3ab9b4d7..992434fe 100644
--- a/DATA/EQUIPMENT/engine_equip.ini
+++ b/DATA/EQUIPMENT/engine_equip.ini
@@ -1483,13 +1483,16 @@ ids_name = 263900
 ids_info = 264900
 volume = 0
 mass = 10
-max_force = 120000
-linear_drag = 3000
+max_force = 48000
+linear_drag = 599
+power_usage = 0
 reverse_fraction = 0.1
 flame_effect = gf_br_lifter_engine01
 cruise_charge_time = 5
 cruise_power_usage = 20
 rumble_sound = rumble_destroyer
+rumble_atten_range = -5, 0
+rumble_pitch_range = -25, 25
 cruise_start_sound = engine_ci_cruise_start
 cruise_loop_sound = engine_ci_cruise_loop
 cruise_stop_sound = engine_ci_cruise_stop
@@ -1499,6 +1502,7 @@ indestructible = false
 outside_cone_attenuation = -3
 inside_sound_cone = 90
 outside_sound_cone = 270
+lootable = false
 
 [Engine]
 nickname = ge_lnr_engine_01
diff --git a/DATA/EQUIPMENT/goods.ini b/DATA/EQUIPMENT/goods.ini
index 7b71ec90..0cbe2dac 100644
--- a/DATA/EQUIPMENT/goods.ini
+++ b/DATA/EQUIPMENT/goods.ini
@@ -2750,3 +2750,35 @@ addon = contrail01, HpContrail01, 1
 addon = contrail01, HpContrail02, 1
 addon = DockingLightRedSmall, HpDockLight01, 1
 addon = DockingLightRedSmall, HpDockLight02, 1
+
+;;Heavy Lifter
+[Good]
+nickname = heavylifter_hull
+category = shiphull
+ship = ge_lifter_player
+price = 10000000
+ids_name = 237024
+item_icon = Equipment\models\commodities\nn_icons\heavy_lifter.3db
+
+
+[Good]
+nickname = heavylifter_package
+category = ship
+hull = heavylifter_hull
+addon = ge_lft_engine_01, internal, 1
+addon = co_elite2_power01, internal, 1
+addon = ge_s_scanner_01, internal, 1
+addon = ge_s_tractor_01, internal, 1
+addon = LargeWhiteSpecial, HpHeadLight01
+addon = SlowMediumWhite, HpRunningLight01
+addon = SlowMediumWhite, HpRunningLight02
+addon = SlowMediumWhite, HpRunningLight03
+addon = SlowMediumWhite, HpRunningLight04
+addon = SlowMediumWhite, HpRunningLight05
+addon = SlowMediumWhite, HpRunningLight06
+addon = SlowMediumWhite, HpRunningLight07
+addon = SlowMediumWhite, HpRunningLight08
+addon = contrail01, HpContrail01, 1
+addon = contrail01, HpContrail02, 1
+addon = DockingLightRedSmall, HpDockLight01, 1
+addon = DockingLightRedSmall, HpDockLight02, 1
\ No newline at end of file
diff --git a/DATA/EQUIPMENT/market_ships.ini b/DATA/EQUIPMENT/market_ships.ini
index fb22888e..31770493 100644
--- a/DATA/EQUIPMENT/market_ships.ini
+++ b/DATA/EQUIPMENT/market_ships.ini
@@ -164,6 +164,10 @@ marketgood = bwf_package, 4, -1, 1, 1, 0, 1, 1
 base = Li01_13_base
 marketgood = pf_package, 2, -1, 1, 1, 0, 1, 1
 
+[BaseGood]
+base = Li01_14_base
+marketgood = heavylifter_package, 1, -1, 1, 1, 0, 1, 1
+
 [BaseGood]
 base = Li01_15_base
 marketgood = oe_package, 16, -1, 1, 1, 0, 1, 1
diff --git a/DATA/MISSIONS/mbases.ini b/DATA/MISSIONS/mbases.ini
index 60e8e6fb..4d8db2f8 100644
--- a/DATA/MISSIONS/mbases.ini
+++ b/DATA/MISSIONS/mbases.ini
@@ -7428,6 +7428,16 @@ individual_name = 244647
 affiliation = co_me_grp
 voice = rvp101
 
+[GF_NPC]
+nickname = li0114_fix_ship
+body = sc_scientist3_body
+head = rh_captain_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 245203
+affiliation = co_me_grp
+voice = rvp101
+
 [GF_NPC]
 nickname = li0114_gateway_001_m
 body = pl_male2_peasant_body
@@ -7695,6 +7705,11 @@ character_density = 2
 fixture = li0114_fix_trader, Zs/NPC/Trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader
 fixture = li0114_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment
 
+[MRoom]
+nickname = ShipDealer
+character_density = 2
+fixture = li0114_fix_ship, Zs/NPC/Shipdealer/01/A/Stand, scripts\vendors\li_shipdealer_fidget.thn, ShipDealer
+
 [MBase]
 nickname = Li01_15_Base
 local_faction = fc_or_grp
diff --git a/DATA/SHIPS/UTILITY/HEAVY_LIFTER/heavy_lifter.cmp b/DATA/SHIPS/UTILITY/HEAVY_LIFTER/heavy_lifter.cmp
index cb65f92f..51ccc4ad 100644
Binary files a/DATA/SHIPS/UTILITY/HEAVY_LIFTER/heavy_lifter.cmp and b/DATA/SHIPS/UTILITY/HEAVY_LIFTER/heavy_lifter.cmp differ
diff --git a/DATA/SHIPS/shiparch.ini b/DATA/SHIPS/shiparch.ini
index ee1954a7..ba6bbf5f 100644
--- a/DATA/SHIPS/shiparch.ini
+++ b/DATA/SHIPS/shiparch.ini
@@ -8971,4 +8971,76 @@ separation_explosion = explosion_small_ship_breakoff
 mass = 5.000000
 type = Port_Wing
 hit_pts = 2150
+root_health_proxy = true
+
+;;Heavy Lifter
+
+[Ship]
+ids_name = 237024
+ids_info = 67001
+ids_info1 = 66552
+ids_info2 = 66608
+ids_info3 = 67002
+ship_class = 2
+nickname = ge_lifter_player
+LODranges = 0, 300, 600, 900, 4000
+msg_id_prefix = gcs_refer_shiparch_hlifter
+mission_property = can_use_med_moors
+type = FREIGHTER
+DA_archetype = ships\utility\heavy_lifter\heavy_lifter.cmp
+material_library = ships\utility\utility_ships.mat
+material_library = fx\envmapbasic.mat
+envmap_material = envmapbasic
+cockpit = cockpits\heavylifter.ini
+pilot_mesh = generic_pilot
+nanobot_limit = 0
+shield_battery_limit = 0
+mass = 500.000000
+hold_size = 475
+linear_drag = 1
+fuse = lifter_death_fuse, 0, 1
+max_bank_angle = 19
+camera_offset = 38, 146
+camera_angular_acceleration = 0.03
+camera_horizontal_turn_angle = 20
+camera_vertical_turn_up_angle = 5
+camera_vertical_turn_down_angle = 20
+camera_turn_look_ahead_slerp_amount = 1
+hit_pts = 185000
+explosion_arch = explosion_cap_ship1
+surface_hit_effects = 0, small_hull_hit_light01, small_hull_hit_light02, small_hull_hit_light03
+surface_hit_effects = 150, small_hull_hit_medium01, small_hull_hit_medium02, small_hull_hit_medium03
+surface_hit_effects = 300, small_hull_hit_heavy01, small_hull_hit_heavy02, small_hull_hit_heavy03
+steering_torque = 12300000, 12300000, 12300000
+angular_drag = 46000000, 46000000, 46000000
+rotation_inertia = 2000000, 18000000, 18000000
+nudge_force = 30000.000000
+strafe_force = 10000.000000
+strafe_power_usage = 2
+bay_door_anim = Sc_open baydoor
+bay_doors_open_snd = cargo_doors_open
+bay_doors_close_snd = cargo_doors_close
+HP_bay_surface = HpBayDoor01
+HP_bay_external = HpBayDoor02
+HP_tractor_source = HpTractor_Source
+num_exhaust_nozzles = 6
+hp_type = hp_freighter_shield_special_1, HpCargo02, HpCargo01
+hp_type = hp_turret_special_9, HpTurret_U1_01, HpTurret_U1_02, HpTurret_U1_03, HpTurret_U1_04, HpTurret_U1_05
+hp_type = hp_turret_special_8, HpTurret_U1_01, HpTurret_U1_02, HpTurret_U1_03, HpTurret_U1_04, HpTurret_U1_05
+hp_type = hp_turret_special_7, HpTurret_U1_01, HpTurret_U1_02, HpTurret_U1_03, HpTurret_U1_04, HpTurret_U1_05
+hp_type = hp_turret_special_6, HpTurret_U1_01, HpTurret_U1_02, HpTurret_U1_03, HpTurret_U1_04, HpTurret_U1_05
+hp_type = hp_turret_special_5, HpTurret_U1_01, HpTurret_U1_02, HpTurret_U1_03, HpTurret_U1_04, HpTurret_U1_05
+hp_type = hp_turret_special_4, HpTurret_U1_01, HpTurret_U1_02, HpTurret_U1_03, HpTurret_U1_04, HpTurret_U1_05
+hp_type = hp_turret_special_3, HpTurret_U1_01, HpTurret_U1_02, HpTurret_U1_03, HpTurret_U1_04, HpTurret_U1_05
+hp_type = hp_turret_special_2, HpTurret_U1_01, HpTurret_U1_02, HpTurret_U1_03, HpTurret_U1_04, HpTurret_U1_05
+hp_type = hp_turret_special_1, HpTurret_U1_01, HpTurret_U1_02, HpTurret_U1_03, HpTurret_U1_04, HpTurret_U1_05
+
+[CollisionGroup]
+obj = lifter_clamp01_lod1
+separable
+child_impulse = 1
+parent_impulse = 60
+debris_type = debris_normal
+fuse = lifter_death_fuse, 0, 1
+hit_pts = 400
 root_health_proxy = true
\ No newline at end of file
diff --git a/DATA/UNIVERSE/SYSTEMS/LI01/BASES/ROOMS/li01_14_deck.ini b/DATA/UNIVERSE/SYSTEMS/LI01/BASES/ROOMS/li01_14_deck.ini
index 0b57a757..18fe12b5 100644
--- a/DATA/UNIVERSE/SYSTEMS/LI01/BASES/ROOMS/li01_14_deck.ini
+++ b/DATA/UNIVERSE/SYSTEMS/LI01/BASES/ROOMS/li01_14_deck.ini
@@ -36,6 +36,11 @@ name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
 behavior = VirtualRoom
 room_switch = Equipment
 
+[Hotspot]
+name = IDS_HOTSPOT_SHIPDEALER_ROOM
+behavior = ExitDoor
+room_switch = ShipDealer
+
 [Hotspot]
 name = IDS_NN_REPAIR_YOUR_SHIP
 behavior = Repair
@@ -81,3 +86,5 @@ name = IDS_NN_REPAIR_YOUR_SHIP
 behavior = Repair
 virtual_room = Equipment
 
+
+
diff --git a/DATA/UNIVERSE/SYSTEMS/LI01/BASES/ROOMS/li01_14_shipdealer.ini b/DATA/UNIVERSE/SYSTEMS/LI01/BASES/ROOMS/li01_14_shipdealer.ini
new file mode 100644
index 00000000..c1d82c55
--- /dev/null
+++ b/DATA/UNIVERSE/SYSTEMS/LI01/BASES/ROOMS/li01_14_shipdealer.ini
@@ -0,0 +1,59 @@
+[Room_Info]
+set_script = Scripts\Bases\li_06_Deck_hardpoint_SDlr.thn
+scene = all, ambient, Scripts\Bases\Li_06_Deck_ambi_int_01.thn
+
+[Spiels]
+ShipDealer = manhattan_ship_spiel
+
+[Camera]
+name = Camera_0
+
+[Room_Sound]
+ambient = ambience_shipbuy
+
+[ForSaleShipPlacement]
+name = X/Shipcentre/01
+
+[Hotspot]
+name = IDS_HOTSPOT_DECK
+behavior = ExitDoor
+room_switch = Deck
+
+[Hotspot]
+name = IDS_HOTSPOT_BAR
+behavior = ExitDoor
+room_switch = Bar
+
+[Hotspot]
+name = IDS_HOTSPOT_COMMODITYTRADER_ROOM
+behavior = ExitDoor
+room_switch = Deck
+set_virtual_room = Trader
+
+[Hotspot]
+name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
+behavior = ExitDoor
+room_switch = Deck
+set_virtual_room = Equipment
+
+[Hotspot]
+name = IDS_HOTSPOT_SHIPDEALER_ROOM
+behavior = ExitDoor
+room_switch = ShipDealer
+
+[Hotspot]
+name = IDS_NN_REPAIR_YOUR_SHIP
+behavior = Repair
+
+[Hotspot]
+name = IDS_DEALER_FRONT_DESK
+behavior = FrontDesk
+state_read = 1
+state_send = 2
+
+[Hotspot]
+name = IDS_HOTSPOT_SHIPDEALER
+behavior = StartShipDealer
+state_read = 2
+state_send = 1
+
diff --git a/DATA/UNIVERSE/SYSTEMS/LI01/BASES/li01_14_base.ini b/DATA/UNIVERSE/SYSTEMS/LI01/BASES/li01_14_base.ini
index c8c2d3fb..c19e277a 100644
--- a/DATA/UNIVERSE/SYSTEMS/LI01/BASES/li01_14_base.ini
+++ b/DATA/UNIVERSE/SYSTEMS/LI01/BASES/li01_14_base.ini
@@ -10,3 +10,7 @@ file = Universe\Systems\Li01\Bases\Rooms\Li01_14_Bar.ini
 nickname = Deck
 file = Universe\Systems\Li01\Bases\Rooms\Li01_14_Deck.ini
 
+[Room]
+nickname = ShipDealer
+file = Universe\Systems\Li01\Bases\Rooms\Li01_14_shipdealer.ini
+
diff --git a/EXE/infocards.dll b/EXE/infocards.dll
index c743e95b..7c0834fa 100644
Binary files a/EXE/infocards.dll and b/EXE/infocards.dll differ
diff --git a/EXE/nameresources.dll b/EXE/nameresources.dll
index 8ed1fa32..97187c1c 100644
Binary files a/EXE/nameresources.dll and b/EXE/nameresources.dll differ