diff --git a/docs/SpriteIDs.xlsx b/docs/SpriteIDs.xlsx
index 7bfab34..4640705 100644
Binary files a/docs/SpriteIDs.xlsx and b/docs/SpriteIDs.xlsx differ
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 46a90aa..9b87550 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -2,9 +2,9 @@
 - Furness Railway Railmotor?
 - GWR 5700/6700/8750 Class (gfx done need coding)
 - Class 20 (graphics drawn? Need to check if they're actually right.... looksl ike the wheels etc need to be taller on some views, definitely needs more liveries)
-- Class 58 (graphics drawn need coding and liveries)
 
 # v2.12
+- Added Class 58
 - Added LMS Black 5
 - Added LMS Jubilee
 - Added GWR Dean Goods
diff --git a/gfx/Diesel/58.png b/gfx/Diesel/58.png
index 781ca9e..46ff6b6 100644
Binary files a/gfx/Diesel/58.png and b/gfx/Diesel/58.png differ
diff --git a/lang/english.lng b/lang/english.lng
index 56553d5..d577d7b 100644
--- a/lang/english.lng
+++ b/lang/english.lng
@@ -498,6 +498,16 @@ str_BR57_usage					:Mixed Traffic
 str_BR57_eos					:---
 str_BR57_liveries				:
 
+STR_NAME_BR58					:BR Class 58 "Bone"
+str_BR58_usage					:Heavy Freight
+str_BR58_eos					:---
+str_BR58_liveries				:Railfreight (2 Tone Grey, 3 Tone Grey, 3 Tone Grey Coal Sector, Mainline Grey, Mainline Blue)
+
+STR_NAME_BR59					:BR Class 59 "Super Shed"
+str_BR59_usage					:Mixed Freight
+str_BR59_eos					:---
+str_BR59_liveries				:
+
 STR_NAME_BR60					:BR Class 60 "Tug"
 str_BR60_usage					:Mixed Freight
 str_BR60_eos					:---
@@ -1722,7 +1732,12 @@ str_PullmanBrown                : (Brown Pullman)
 str_Random                      : (Random)
 str_RandomEyeCandy              : (Random - Always show container)
 str_Railtrack					: (Railtrack)
-str_RailfreightGrey				: (Rail Freight - Grey)
+str_RailfreightGrey				: (RailFreight - Grey)
+str_Railfreight2Grey			: (RailFreight - 2 Tone Grey)
+str_Railfreight3Grey			: (RailFreight - 3 Tone Grey)
+str_Railfreight3GreyCoal		: (RailFreight - 3 Tone Grey - Coal)
+str_RailfreightMainlineGrey		: (RailFreight - Mainline Grey)
+str_RailfreightMainlineBlue		: (RailFreight - Mainline Blue)
 str_Regional					: (Regional Railways)
 str_RegionalExpress				: (Regional Railways Express)
 str_RegionalGreen				: (Regional Railways - Green)
diff --git a/src/trains/diesel_loco/58.pnml b/src/trains/diesel_loco/58.pnml
new file mode 100644
index 0000000..205f2d3
--- /dev/null
+++ b/src/trains/diesel_loco/58.pnml
@@ -0,0 +1,89 @@
+spriteset(spriteset_BR58_Purchase, "gfx/Diesel/58.png") {
+	template_purchase(0, 0)
+}
+
+spriteset(spriteset_BR58_RF2Grey, "gfx/Diesel/58.png") {
+	template_train32px(0, 13)
+}
+
+spriteset(spriteset_BR58_RF3Grey, "gfx/Diesel/58.png") {
+	template_train32px(0, 39)
+}
+
+spriteset(spriteset_BR58_RF3GreyCoal, "gfx/Diesel/58.png") {
+	template_train32px(0, 65)
+}
+
+spriteset(spriteset_BR58_RFMainlineGrey, "gfx/Diesel/58.png") {
+	template_train32px(0, 91)
+}
+
+spriteset(spriteset_BR58_RFMainlineBlue, "gfx/Diesel/58.png") {
+	template_train32px(0, 117)
+}
+
+switch(FEAT_TRAINS,SELF, sw_BR58,cargo_subtype){
+	0: 	spriteset_BR58_RF2Grey;
+	1: 	spriteset_BR58_RF3Grey;
+	2:	spriteset_BR58_RF3GreyCoal;
+	3:	spriteset_BR58_RFMainlineGrey;
+	4:	spriteset_BR58_RFMainlineBlue;
+}
+
+switch(FEAT_TRAINS,SELF,sw_BR58_cargo_subtype_text,cargo_subtype){
+	0: 	return string(str_Railfreight2Grey);
+	1: 	return string(str_Railfreight3Grey);
+	2:	return string(str_Railfreight3GreyCoal);
+	3:	return string(str_RailfreightMainlineGrey);
+	4:	return string(str_RailfreightMainlineBlue);
+       return CB_RESULT_NO_TEXT;
+}
+
+item (FEAT_TRAINS, item_BR58, 673) {
+	property {
+		variant_group:					header_Diesel;
+		name: 							string(STR_NAME_BR58);
+		climates_available: 			ALL_CLIMATES;
+		introduction_date:				date(1983,4,21);
+		model_life:						15;
+		retire_early:					1;
+		vehicle_life:					30;
+		reliability_decay:				7;
+		refittable_cargo_classes:		0;
+		cargo_allow_refit:				[GOOD, FOOD];
+		loading_speed:					3;
+		cost_factor:					1;
+		running_cost_factor:			1;
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		speed:							80 mph;
+		refit_cost:						0;
+		track_type:						RAIL;
+		ai_special_flag:				AI_FLAG_CARGO;
+		power:							3300 hp;
+		running_cost_base:				RUNNING_COST_DIESEL;
+		dual_headed:					0;
+		default_cargo_type:				GOOD;
+		cargo_capacity:					1;
+		weight:							130 ton;
+		engine_class:					ENGINE_CLASS_DIESEL;
+		tractive_effort_coefficient:	0.205;
+		air_drag_coefficient:			0.07;
+		length:							8;
+		effect_spawn_model_and_powered:	EFFECT_SPAWN_MODEL_DIESEL;
+		extra_weight_per_wagon:			0;
+		bitmask_vehicle_info:			0;
+	}
+	graphics {
+	additional_text:					return(string(str_purchase_loco_with_liveries,string(str_purchase_type_diesel),string(str_BR58_usage),string(str_BR58_eos),string(str_BR58_liveries)));
+	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
+	cargo_capacity:						return 0;
+	cargo_subtype_text:					sw_BR58_cargo_subtype_text;
+	default: 							sw_BR58;
+	purchase:							spriteset_BR58_Purchase;
+	colour_mapping: 					return PALETTE_CC_FIRST;
+	create_effect:						diesel_create_visual_effect;
+	sound_effect:						sw_58_sound;
+	cost_factor:	return(GetAdjustedCost(45));
+	running_cost_factor: return(GetAdjustedCost(39));
+}
+}
\ No newline at end of file