diff --git a/code/__DEFINES/paygrade_defs/army.dm b/code/__DEFINES/paygrade_defs/army.dm
new file mode 100644
index 0000000000..c6f93cef03
--- /dev/null
+++ b/code/__DEFINES/paygrade_defs/army.dm
@@ -0,0 +1,96 @@
+// Paygrade shorthand defines, to allow clearer designation.
+
+// US Army
+
+/// AE1, Private
+#define PAY_SHORT_AE1 "AE1"
+
+/// AE2, Private
+#define PAY_SHORT_AE2 "AE2"
+
+/// AE3, Private First Class
+#define PAY_SHORT_AE3 "AE3"
+
+/// AE4, Corporal
+#define PAY_SHORT_AE4 "AE4"
+
+/// AE4E, Specialist
+#define PAY_SHORT_AE4E "AE4E"
+
+/// AE5, Sergeant
+#define PAY_SHORT_AE5 "AE5"
+
+/// AE6, Staff Sergeant
+#define PAY_SHORT_AE6 "AE6"
+
+/// AE7, Sergeant First Class
+#define PAY_SHORT_AE7 "AE7"
+
+/// AE8, Master Sergeant
+#define PAY_SHORT_AE8 "AE8"
+
+/// AE8E, First Sergeant
+#define PAY_SHORT_AE8E "AE8E"
+
+/// AE9, Sergeant Major
+#define PAY_SHORT_AE9 "AE9"
+
+/// AE9E, Command Sergeant Major
+#define PAY_SHORT_AE9E "AE9E"
+
+/// AE9C, Sergeant Major of the Army
+#define PAY_SHORT_AE9C "AE9C"
+
+/// AW1, Warrant Officer 1
+#define PAY_SHORT_AW1 "AW1"
+
+/// AW1, Chief Warrant Officer 2
+#define PAY_SHORT_AW2 "ACW2"
+
+/// AW1, Chief Warrant Officer 3
+#define PAY_SHORT_AW3 "ACW3"
+
+/// AW1, Chief Warrant Officer 4
+#define PAY_SHORT_AW4 "ACW4"
+
+/// AW1, Chief Warrant Officer 5
+#define PAY_SHORT_AW5 "ACW5"
+
+/// AO1, Second Lieutenant
+#define PAY_SHORT_AO1 "AO1"
+
+/// AO2, First Lieutenant
+#define PAY_SHORT_AO2 "AO2"
+
+/// AO3, Captain
+#define PAY_SHORT_AO3 "AO3"
+
+/// AO4, Major
+#define PAY_SHORT_AO4 "AO4"
+
+/// AO5, Lieutenant Colonel
+#define PAY_SHORT_AO5 "AO5"
+
+/// AO6, Colonel
+#define PAY_SHORT_AO6 "AO6"
+
+/// AO6E, Senior Colonel
+#define PAY_SHORT_AO6E "AO6E"
+
+/// AO6C, Division Colonel
+#define PAY_SHORT_AO6C "AO6C"
+
+/// AO7, Brigadier General
+#define PAY_SHORT_AO7 "AO7"
+
+/// AO8, Major General
+#define PAY_SHORT_AO8 "AO8"
+
+/// AO9, Lieutenant General
+#define PAY_SHORT_AO9 "AO9"
+
+/// AO10, General
+#define PAY_SHORT_AO10 "AO10"
+
+/// AO10C, General of the Army
+#define PAY_SHORT_AO10C "AO10C"
diff --git a/code/__DEFINES/paygrade_defs/navy.dm b/code/__DEFINES/paygrade_defs/navy.dm
index d51cccb8fe..1804cdece3 100644
--- a/code/__DEFINES/paygrade_defs/navy.dm
+++ b/code/__DEFINES/paygrade_defs/navy.dm
@@ -1,10 +1,11 @@
 // Paygrade shorthand defines, to allow clearer designation.
 
-// USCM NAVY
+// USASF, the evolution of the USN & USAF, still considered Naval for the branch prefix
+
 /// NE1, Seaman Recruit
 #define PAY_SHORT_NE1 "NE1"
 
-/// NE2M, Seaman Apprentice
+/// NE2, Seaman Apprentice
 #define PAY_SHORT_NE2 "NE2"
 
 /// NE3, Seaman
@@ -17,7 +18,7 @@
 #define PAY_SHORT_NE5 "NE5"
 
 /// NE6, Petty Officer 1st Class
-#define PAY_SHORT_NE6 "N36"
+#define PAY_SHORT_NE6 "NE6"
 
 /// NE7, Chief Petty Officer
 #define PAY_SHORT_NE7 "NE7"
@@ -34,6 +35,21 @@
 /// NE9C, Command Master Chief Petty Officer
 #define PAY_SHORT_NE9C "NE9C"
 
+/// NW1, Warrant Officer 1
+#define PAY_SHORT_NW1 "NW1"
+
+/// NW1, Chief Warrant Officer 2
+#define PAY_SHORT_NW2 "NCW2"
+
+/// NW1, Chief Warrant Officer 3
+#define PAY_SHORT_NW3 "NCW3"
+
+/// NW1, Chief Warrant Officer 4
+#define PAY_SHORT_NW4 "NCW4"
+
+/// NW1, Chief Warrant Officer 5
+#define PAY_SHORT_NW5 "NCW5"
+
 /// NO1, Ensign
 #define PAY_SHORT_NO1 "NO1"
 
diff --git a/code/datums/paygrades/factions/uscm/army.dm b/code/datums/paygrades/factions/uscm/army.dm
new file mode 100644
index 0000000000..4399ab02a3
--- /dev/null
+++ b/code/datums/paygrades/factions/uscm/army.dm
@@ -0,0 +1,273 @@
+/datum/paygrade/army
+	name = "Army Paygrade"
+	rank_pin = /obj/item/clothing/accessory/ranks/army
+	pay_multiplier = 1.4	//Army strong, army smash, meatheads get paid a lil' less 'cause they get decent kit
+	default_faction = FACTION_MARINE
+
+// ENLISTED PAYGRADES
+
+/datum/paygrade/army/e1
+	paygrade = PAY_SHORT_AE1
+	name = "Private"
+	prefix = "PV1."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/e1
+	ranking = 0
+	pay_multiplier = 1.4
+
+/datum/paygrade/army/e2
+	paygrade = PAY_SHORT_AE2
+	name = "Private"
+	prefix = "PV2."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/e2
+	ranking = 1
+	pay_multiplier = 1.5
+
+/datum/paygrade/army/e3
+	paygrade = PAY_SHORT_AE3
+	name = "Private First Class"
+	prefix = "PFC."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/e3
+	ranking = 2
+	pay_multiplier = 1.6
+
+/datum/paygrade/army/e4
+	paygrade = PAY_SHORT_AE4
+	name = "Corporal"
+	prefix = "CPL."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/e4
+	ranking = 3
+	pay_multiplier = 1.8
+
+/datum/paygrade/army/e4e
+	paygrade = PAY_SHORT_AE4E
+	name = "Specialist"
+	prefix = "SPC."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/e4e
+	ranking = 4
+	pay_multiplier = 1.8
+
+/datum/paygrade/army/e5
+	paygrade = PAY_SHORT_AE5
+	name = "Sergeant"
+	prefix = "SGT."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/e5
+	ranking = 5
+	pay_multiplier = 2
+
+/datum/paygrade/army/e6
+	paygrade = PAY_SHORT_AE6
+	name = "Staff Sergeant"
+	prefix = "SSGT."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/e6
+	ranking = 6
+	pay_multiplier = 2.2
+
+/datum/paygrade/army/e7
+	paygrade = PAY_SHORT_AE7
+	name = "Sergeant First Class"
+	prefix = "SFC."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/e7
+	ranking = 7
+	pay_multiplier = 2.4
+
+/datum/paygrade/army/e8
+	paygrade = PAY_SHORT_AE8
+	name = "Master Sergeant"
+	prefix = "MSG."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/e8
+	ranking = 8
+	pay_multiplier = 2.5
+
+/datum/paygrade/army/e8e
+	paygrade = PAY_SHORT_AE8E
+	name = "First Sergeant"
+	prefix = "1SG."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/e8e
+	ranking = 9
+	pay_multiplier = 2.5
+
+/datum/paygrade/army/e9
+	paygrade = PAY_SHORT_AE9
+	name = "Sergeant Major"
+	prefix = "SGM."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/e9
+	ranking = 10
+	pay_multiplier = 2.75
+
+/datum/paygrade/army/e9e
+	paygrade = PAY_SHORT_AE9E
+	name = "Command Sergeant Major"
+	prefix = "CSM."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/e9e
+	ranking = 11
+	pay_multiplier = 2.75
+
+/datum/paygrade/army/e9c
+	paygrade = PAY_SHORT_AE9C
+	name = "Sergeant Major of the Army"
+	prefix = "SMA."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/e9c
+	ranking = 12
+	pay_multiplier = 2.8
+
+// WARRANT OFFICER PAYGRADES
+
+/datum/paygrade/army/w1
+	paygrade = PAY_SHORT_AW1
+	name = "Warrant Officer"
+	prefix = "WO1."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/w1
+	ranking = 13
+	pay_multiplier = 2.4	//Pay on par with E7 to begin with
+
+/datum/paygrade/army/w2
+	paygrade = PAY_SHORT_AW2
+	name = "Chief Warrant Officer 2"
+	prefix = "CW2."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/w2
+	ranking = 14
+	pay_multiplier = 2.5
+
+/datum/paygrade/army/w3
+	paygrade = PAY_SHORT_AW3
+	name = "Chief Warrant Officer 3"
+	prefix = "CW3."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/w3
+	ranking = 15
+	pay_multiplier = 2.7
+
+/datum/paygrade/army/w1
+	paygrade = PAY_SHORT_AW4
+	name = "Chief Warrant Officer 4"
+	prefix = "CW4."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/w4
+	ranking = 16
+	pay_multiplier = 2.9
+
+/datum/paygrade/army/w5
+	paygrade = PAY_SHORT_AW5
+	name = "Chief Warrant Officer 5"
+	prefix = "CW5."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/w5
+	ranking = 17
+	pay_multiplier = 3
+
+// COMMISSIONED PAYGRADES
+
+/datum/paygrade/army/o1
+	paygrade = PAY_SHORT_AO1
+	name = "Second Lieutenant"
+	prefix = "2LT."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/o1
+	ranking = 18
+	pay_multiplier = 3
+	officer_grade = GRADE_OFFICER
+
+/datum/paygrade/army/o2
+	paygrade = PAY_SHORT_AO2
+	name = "First Lieutenant"
+	prefix = "1LT."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/o2
+	ranking = 19
+	pay_multiplier = 3.1
+	officer_grade = GRADE_OFFICER
+
+/datum/paygrade/army/o3
+	paygrade = PAY_SHORT_AO3
+	name = "Captain"
+	prefix = "CPT."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/o3
+	ranking = 20
+	pay_multiplier = 3.3
+	officer_grade = GRADE_OFFICER
+
+/datum/paygrade/army/o4
+	paygrade = PAY_SHORT_AO4
+	name = "Major"
+	prefix = "MAJ."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/o4
+	ranking = 21
+	pay_multiplier = 3.5
+	officer_grade = GRADE_OFFICER
+
+/datum/paygrade/army/o5
+	paygrade = PAY_SHORT_AO5
+	name = "Lieutenant Colonel"
+	prefix = "LTC."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/o5
+	ranking = 22
+	pay_multiplier = 3.7
+	officer_grade = GRADE_OFFICER
+
+/datum/paygrade/army/o6
+	paygrade = PAY_SHORT_AO6
+	name = "Colonel"
+	prefix = "COL."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/o6
+	ranking = 23
+	pay_multiplier = 3.9
+	officer_grade = GRADE_OFFICER
+
+/datum/paygrade/army/o6e
+	paygrade = PAY_SHORT_AO6E
+	name = "Senior Colonel"
+	prefix = "SCL."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/o6e
+	ranking = 24
+	pay_multiplier = 4.2
+	officer_grade = GRADE_OFFICER
+
+/datum/paygrade/army/o6c
+	paygrade = PAY_SHORT_AO6C
+	name = "Division Colonel"
+	prefix = "DCL."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/o6c
+	ranking = 25
+	pay_multiplier = 4.5
+	officer_grade = GRADE_OFFICER
+
+//High Command
+/datum/paygrade/army/o7
+	paygrade = PAY_SHORT_AO7
+	name = "Brigadier General"
+	prefix = "BG."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/o7
+	ranking = 26
+	pay_multiplier = 6
+	officer_grade = GRADE_FLAG
+
+/datum/paygrade/army/o8
+	paygrade = PAY_SHORT_AO8
+	name = "Major General"
+	prefix = "MG."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/o8
+	ranking = 27
+	pay_multiplier = 6.1
+	officer_grade = GRADE_FLAG
+
+/datum/paygrade/army/o9
+	paygrade = PAY_SHORT_AO9
+	name = "Lieutenant General"
+	prefix = "LTG."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/o9
+	ranking = 28
+	pay_multiplier = 6.2
+	officer_grade = GRADE_FLAG
+
+/datum/paygrade/army/o10
+	paygrade = PAY_SHORT_AO10
+	name = "General"
+	prefix = "GEN."
+	rank_pin = /obj/item/clothing/accessory/ranks/army/o10
+	ranking = 29
+	pay_multiplier = 6.5
+	officer_grade = GRADE_FLAG
+
+/datum/paygrade/army/o10c
+	paygrade = PAY_SHORT_AO10C
+	name = "General of the Army"
+	prefix = "GEN.A"
+	rank_pin = /obj/item/clothing/accessory/ranks/army/o10c
+	ranking = 30
+	pay_multiplier = 7
+	officer_grade = GRADE_FLAG
diff --git a/code/datums/paygrades/factions/uscm/navy.dm b/code/datums/paygrades/factions/uscm/navy.dm
index 69fb63676b..0c2c44ae6d 100644
--- a/code/datums/paygrades/factions/uscm/navy.dm
+++ b/code/datums/paygrades/factions/uscm/navy.dm
@@ -1,8 +1,8 @@
 /datum/paygrade/navy
 	name = "Navy Paygrade"
 	rank_pin = /obj/item/clothing/accessory/ranks/navy
+	pay_multiplier = 1.8	//Less members but also more technical work, paid a bit better across the board
 	default_faction = FACTION_MARINE
-	//someone else can do the multipliers for this one
 
 // ENLISTED PAYGRADES
 
@@ -12,6 +12,7 @@
 	prefix = "SR."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/e1
 	ranking = 0
+	pay_multiplier = 1.8
 
 /datum/paygrade/navy/e2
 	paygrade = PAY_SHORT_NE2
@@ -19,6 +20,7 @@
 	prefix = "SA."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/e2
 	ranking = 1
+	pay_multiplier = 1.9
 
 /datum/paygrade/navy/e3
 	paygrade = PAY_SHORT_NE3
@@ -26,13 +28,15 @@
 	prefix = "SN."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/e3
 	ranking = 2
+	pay_multiplier = 2.1
 
 /datum/paygrade/navy/e4
 	paygrade = PAY_SHORT_NE4
 	name = "Petty Officer 3rd Class"
-	prefix = "PO1."
+	prefix = "PO3."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/e4
 	ranking = 3
+	pay_multiplier = 2.3
 
 /datum/paygrade/navy/e5
 	paygrade = PAY_SHORT_NE5
@@ -40,6 +44,7 @@
 	prefix = "PO2."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/e5
 	ranking = 4
+	pay_multiplier = 2.5
 
 /datum/paygrade/navy/e6
 	paygrade = PAY_SHORT_NE6
@@ -47,6 +52,7 @@
 	prefix = "PO1."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/e6
 	ranking = 5
+	pay_multiplier = 2.7
 
 /datum/paygrade/navy/e7
 	paygrade = PAY_SHORT_NE7
@@ -54,6 +60,7 @@
 	prefix = "CPO."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/e7
 	ranking = 6
+	pay_multiplier = 3
 
 /datum/paygrade/navy/e8
 	paygrade = PAY_SHORT_NE8
@@ -61,6 +68,7 @@
 	prefix = "SCPO."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/e8
 	ranking = 7
+	pay_multiplier = 3.1
 
 /datum/paygrade/navy/e8c
 	paygrade = PAY_SHORT_NE8C
@@ -68,6 +76,7 @@
 	prefix = "CSCPO."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/e8c
 	ranking = 8
+	pay_multiplier = 3.3
 
 /datum/paygrade/navy/e9
 	paygrade = PAY_SHORT_NE9
@@ -75,6 +84,7 @@
 	prefix = "MCPO."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/e9
 	ranking = 9
+	pay_multiplier = 3.3
 
 /datum/paygrade/navy/e9c
 	paygrade = PAY_SHORT_NE9C
@@ -82,6 +92,49 @@
 	prefix = "CMCPO."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/e9c
 	ranking = 10
+	pay_multiplier = 3.5
+
+// WARRANT OFFICER PAYGRADES
+
+/datum/paygrade/navy/w1
+	paygrade = PAY_SHORT_NW1
+	name = "Warrant Officer"
+	prefix = "WO1."
+	rank_pin = /obj/item/clothing/accessory/ranks/navy/w1
+	ranking = 11
+	pay_multiplier = 3.1	//Pay on par with E7 to begin with
+
+/datum/paygrade/navy/w2
+	paygrade = PAY_SHORT_NW2
+	name = "Chief Warrant Officer 2"
+	prefix = "CWO2."
+	rank_pin = /obj/item/clothing/accessory/ranks/navy/w2
+	ranking = 12
+	pay_multiplier = 3.2
+
+/datum/paygrade/navy/w3
+	paygrade = PAY_SHORT_NW3
+	name = "Chief Warrant Officer 3"
+	prefix = "CWO3."
+	rank_pin = /obj/item/clothing/accessory/ranks/navy/w3
+	ranking = 13
+	pay_multiplier = 3.3
+
+/datum/paygrade/navy/w1
+	paygrade = PAY_SHORT_NW4
+	name = "Chief Warrant Officer 4"
+	prefix = "CWO4."
+	rank_pin = /obj/item/clothing/accessory/ranks/navy/w4
+	ranking = 14
+	pay_multiplier = 3.4
+
+/datum/paygrade/navy/w5
+	paygrade = PAY_SHORT_NW5
+	name = "Chief Warrant Officer 5"
+	prefix = "CWO5."
+	rank_pin = /obj/item/clothing/accessory/ranks/navy/w5
+	ranking = 15
+	pay_multiplier = 3.5
 
 // COMMISSIONED PAYGRADES
 
@@ -90,7 +143,8 @@
 	name = "Ensign"
 	prefix = "ENS."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/o1
-	ranking = 11
+	ranking = 16
+	pay_multiplier = 3.5
 	officer_grade = GRADE_OFFICER
 
 /datum/paygrade/navy/o2
@@ -98,7 +152,8 @@
 	name = "Lieutenant Junior Grade"
 	prefix = "LTJG."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/o2
-	ranking = 12
+	ranking = 17
+	pay_multiplier = 3.7
 	officer_grade = GRADE_OFFICER
 
 /datum/paygrade/navy/o3
@@ -106,7 +161,8 @@
 	name = "Lieutenant"
 	prefix = "LT."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/o3
-	ranking = 13
+	ranking = 18
+	pay_multiplier = 4.2
 	officer_grade = GRADE_OFFICER
 
 /datum/paygrade/navy/o4
@@ -114,7 +170,8 @@
 	name = "Lieutenant Commander"
 	prefix = "LCDR."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/o4
-	ranking = 14
+	ranking = 19
+	pay_multiplier = 4.5
 	officer_grade = GRADE_OFFICER
 
 /datum/paygrade/navy/o5
@@ -122,7 +179,8 @@
 	name = "Commander"
 	prefix = "CDR."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/o5
-	ranking = 15
+	ranking = 20
+	pay_multiplier = 4.8
 	officer_grade = GRADE_OFFICER
 
 /datum/paygrade/navy/o6
@@ -130,7 +188,8 @@
 	name = "Captain"
 	prefix = "CAPT."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/o6
-	ranking = 16
+	ranking = 21
+	pay_multiplier = 5
 	officer_grade = GRADE_OFFICER
 
 /datum/paygrade/navy/o6e
@@ -138,7 +197,8 @@
 	name = "Commodore"
 	prefix = "CDRE."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/o6e
-	ranking = 17
+	ranking = 22
+	pay_multiplier = 5.2
 	officer_grade = GRADE_OFFICER
 
 /datum/paygrade/navy/o6c
@@ -146,15 +206,18 @@
 	name = "Senior Commodore"
 	prefix = "Snr CDRE."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/o6e
-	ranking = 18
+	ranking = 23
+	pay_multiplier = 5.4
 	officer_grade = GRADE_OFFICER
 
+// Admirality (Naval High Command)
 /datum/paygrade/navy/o7
 	paygrade = PAY_SHORT_NO7
 	name = "Rear Admiral (Lower Half)"
 	prefix = "RDML."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/o7
-	ranking = 19
+	ranking = 24
+	pay_multiplier = 7.5
 	officer_grade = GRADE_FLAG
 
 /datum/paygrade/navy/o8
@@ -162,7 +225,8 @@
 	name = "Rear Admiral (Upper Half)"
 	prefix = "RADM."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/o8
-	ranking = 20
+	ranking = 25
+	pay_multiplier = 7.7
 	officer_grade = GRADE_FLAG
 
 /datum/paygrade/navy/o9
@@ -170,7 +234,8 @@
 	name = "Vice Admiral"
 	prefix = "VADM."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/o9
-	ranking = 21
+	ranking = 26
+	pay_multiplier = 8
 	officer_grade = GRADE_FLAG
 
 /datum/paygrade/navy/o10
@@ -178,7 +243,8 @@
 	name = "Admiral"
 	prefix = "ADM."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/o10
-	ranking = 22
+	ranking = 27
+	pay_multiplier = 8.2
 	officer_grade = GRADE_FLAG
 
 /datum/paygrade/navy/o10c
@@ -186,5 +252,6 @@
 	name = "Chief of Naval Operations"
 	prefix = "CNO."
 	rank_pin = /obj/item/clothing/accessory/ranks/navy/o10c
-	ranking = 23
+	ranking = 28
+	pay_multiplier = 8.5
 	officer_grade = GRADE_FLAG
diff --git a/code/datums/paygrades/paygrade.dm b/code/datums/paygrades/paygrade.dm
index 19d33a4e55..4fbb5b3bf5 100644
--- a/code/datums/paygrades/paygrade.dm
+++ b/code/datums/paygrades/paygrade.dm
@@ -31,7 +31,12 @@ GLOBAL_LIST_INIT(co_paygrades, list(
 	PAY_SHORT_MO6E,
 	PAY_SHORT_MO6C,
 	PAY_SHORT_MO5,
-	PAY_SHORT_MO4
+	PAY_SHORT_MO4,
+	PAY_SHORT_AO6,
+	PAY_SHORT_AO6E,
+	PAY_SHORT_AO6C,
+	PAY_SHORT_AO5,
+	PAY_SHORT_AO4
 ))
 
 /datum/paygrade/New()
diff --git a/code/modules/clothing/under/rank_pins.dm b/code/modules/clothing/under/rank_pins.dm
index 894ff6d879..111e89cff3 100644
--- a/code/modules/clothing/under/rank_pins.dm
+++ b/code/modules/clothing/under/rank_pins.dm
@@ -180,6 +180,32 @@
 	rank_short = PAY_SHORT_NE9C
 	icon_state = "ranks_snco"
 
+//WARRANT OFFICERS
+/obj/item/clothing/accessory/ranks/navy/w1
+	name = "rank boards"
+	rank_short = PAY_SHORT_NW1
+	icon_state = "ranks_officer"
+
+/obj/item/clothing/accessory/ranks/navy/w2
+	name = "rank boards"
+	rank_short = PAY_SHORT_NW2
+	icon_state = "ranks_officer"
+
+/obj/item/clothing/accessory/ranks/navy/w3
+	name = "rank boards"
+	rank_short = PAY_SHORT_NW3
+	icon_state = "ranks_officer"
+
+/obj/item/clothing/accessory/ranks/navy/w4
+	name = "rank boards"
+	rank_short = PAY_SHORT_NW4
+	icon_state = "ranks_officer"
+
+/obj/item/clothing/accessory/ranks/navy/w5
+	name = "rank boards"
+	rank_short = PAY_SHORT_NW5
+	icon_state = "ranks_officer"
+
 //OFFICERS
 /obj/item/clothing/accessory/ranks/navy/o1
 	name = "rank boards"
@@ -246,6 +272,151 @@
 	rank_short = PAY_SHORT_NO10C
 	icon_state = "ranks_flagofficer"
 
+/*################################################
+################ ARMY  #####################
+################################################*/
+//ENLISTED
+/obj/item/clothing/accessory/ranks/army/e1
+	rank_short = PAY_SHORT_AE1
+
+/obj/item/clothing/accessory/ranks/army/e2
+	rank_short = PAY_SHORT_AE2
+
+/obj/item/clothing/accessory/ranks/army/e3
+	rank_short = PAY_SHORT_AE3
+
+/obj/item/clothing/accessory/ranks/army/e4
+	rank_short = PAY_SHORT_AE4
+	icon_state = "ranks_nco"
+
+/obj/item/clothing/accessory/ranks/army/e4e
+	rank_short = PAY_SHORT_AE4E
+	icon_state = "ranks_nco"
+
+/obj/item/clothing/accessory/ranks/army/e5
+	rank_short = PAY_SHORT_AE5
+	icon_state = "ranks_nco"
+
+/obj/item/clothing/accessory/ranks/army/e6
+	rank_short = PAY_SHORT_AE6
+	icon_state = "ranks_nco"
+
+/obj/item/clothing/accessory/ranks/army/e7
+	rank_short = PAY_SHORT_AE7
+	icon_state = "ranks_snco"
+
+/obj/item/clothing/accessory/ranks/army/e8
+	rank_short = PAY_SHORT_AE8
+	icon_state = "ranks_snco"
+
+/obj/item/clothing/accessory/ranks/army/e8e
+	rank_short = PAY_SHORT_AE8E
+	icon_state = "ranks_snco"
+
+/obj/item/clothing/accessory/ranks/army/e9
+	rank_short = PAY_SHORT_AE9
+	icon_state = "ranks_snco"
+
+/obj/item/clothing/accessory/ranks/army/e9e
+	rank_short = PAY_SHORT_AE9E
+	icon_state = "ranks_snco"
+
+/obj/item/clothing/accessory/ranks/army/e9c
+	rank_short = PAY_SHORT_AE9C
+	icon_state = "ranks_snco"
+
+//WARRANT OFFICERS
+/obj/item/clothing/accessory/ranks/army/w1
+	name = "rank boards"
+	rank_short = PAY_SHORT_AW1
+	icon_state = "ranks_officer"
+
+/obj/item/clothing/accessory/ranks/army/w2
+	name = "rank boards"
+	rank_short = PAY_SHORT_AW2
+	icon_state = "ranks_officer"
+
+/obj/item/clothing/accessory/ranks/army/w3
+	name = "rank boards"
+	rank_short = PAY_SHORT_AW3
+	icon_state = "ranks_officer"
+
+/obj/item/clothing/accessory/ranks/army/w4
+	name = "rank boards"
+	rank_short = PAY_SHORT_AW4
+	icon_state = "ranks_officer"
+
+/obj/item/clothing/accessory/ranks/army/w5
+	name = "rank boards"
+	rank_short = PAY_SHORT_AW5
+	icon_state = "ranks_officer"
+
+//OFFICERS
+/obj/item/clothing/accessory/ranks/army/o1
+	name = "rank boards"
+	rank_short = PAY_SHORT_AO1
+	icon_state = "ranks_officer"
+
+/obj/item/clothing/accessory/ranks/army/o2
+	name = "rank boards"
+	rank_short = PAY_SHORT_AO2
+	icon_state = "ranks_officer"
+
+/obj/item/clothing/accessory/ranks/army/o3
+	name = "rank boards"
+	rank_short = PAY_SHORT_AO3
+	icon_state = "ranks_officer"
+
+/obj/item/clothing/accessory/ranks/army/o4
+	name = "rank boards"
+	rank_short = PAY_SHORT_AO4
+	icon_state = "ranks_seniorofficer"
+
+/obj/item/clothing/accessory/ranks/army/o5
+	name = "rank boards"
+	rank_short = PAY_SHORT_AO5
+	icon_state = "ranks_seniorofficer"
+
+/obj/item/clothing/accessory/ranks/army/o6
+	name = "rank boards"
+	rank_short = PAY_SHORT_AO6
+	icon_state = "ranks_seniorofficer"
+
+/obj/item/clothing/accessory/ranks/army/o6e
+	name = "rank boards"
+	rank_short = PAY_SHORT_AO6E
+	icon_state = "ranks_seniorofficer"
+
+/obj/item/clothing/accessory/ranks/army/o6c
+	name = "rank boards"
+	rank_short = PAY_SHORT_AO6C
+	icon_state = "ranks_seniorofficer"
+
+/obj/item/clothing/accessory/ranks/army/o7
+	name = "rank boards"
+	rank_short = PAY_SHORT_AO7
+	icon_state = "ranks_flagofficer"
+
+/obj/item/clothing/accessory/ranks/army/o8
+	name = "rank boards"
+	rank_short = PAY_SHORT_AO8
+	icon_state = "ranks_flagofficer"
+
+/obj/item/clothing/accessory/ranks/army/o9
+	name = "rank boards"
+	rank_short = PAY_SHORT_AO9
+	icon_state = "ranks_flagofficer"
+
+/obj/item/clothing/accessory/ranks/army/o10
+	name = "rank boards"
+	rank_short = PAY_SHORT_AO10
+	icon_state = "ranks_flagofficer"
+
+/obj/item/clothing/accessory/ranks/army/o10c
+	name = "rank boards"
+	rank_short = PAY_SHORT_AO10C
+	icon_state = "ranks_flagofficer"
+
 /*################################################
 ################# SPECIAL  #################
 ################################################*/
diff --git a/colonialmarines.dme b/colonialmarines.dme
index 2acf1dec00..a23f544ce4 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -145,6 +145,7 @@
 #include "code\__DEFINES\dcs\signals\atom\mob\living\signals_human.dm"
 #include "code\__DEFINES\dcs\signals\atom\mob\living\signals_living.dm"
 #include "code\__DEFINES\dcs\signals\atom\mob\living\signals_xeno.dm"
+#include "code\__DEFINES\paygrade_defs\army.dm"
 #include "code\__DEFINES\paygrade_defs\civilian.dm"
 #include "code\__DEFINES\paygrade_defs\cmb.dm"
 #include "code\__DEFINES\paygrade_defs\dutch.dm"
@@ -630,6 +631,7 @@
 #include "code\datums\paygrades\factions\other\misc.dm"
 #include "code\datums\paygrades\factions\twe\twe.dm"
 #include "code\datums\paygrades\factions\upp\upp.dm"
+#include "code\datums\paygrades\factions\uscm\army.dm"
 #include "code\datums\paygrades\factions\uscm\marine.dm"
 #include "code\datums\paygrades\factions\uscm\navy.dm"
 #include "code\datums\paygrades\factions\uscm\provost.dm"