diff --git a/player/race/fenx.arc b/player/race/fenx.arc
index aaf05ff80..1b7a32303 100644
--- a/player/race/fenx.arc
+++ b/player/race/fenx.arc
@@ -79,54 +79,3 @@ applied 1
 no_drop 1
 speed 0
 end
-Object fenx_player_sword
-anim
-fenx.111
-fenx.112
-fenx.111
-fenx_sword.131
-fenx_sword.132
-fenx_sword.131
-fenx_sword.151
-fenx_sword.152
-fenx_sword.151
-fenx_sword.171
-fenx_sword.172
-fenx_sword.171
-facings 4
-mina
-end
-Object fenx_player_spellcasting
-anim
-fenx_spellcasting.151
-fenx_spellcasting.152
-fenx_spellcasting.151
-fenx_spellcasting.151
-fenx_spellcasting.152
-fenx_spellcasting.151
-fenx_spellcasting.151
-fenx_spellcasting.152
-fenx_spellcasting.151
-fenx_spellcasting.151
-fenx_spellcasting.152
-fenx_spellcasting.151
-facings 4
-mina
-end
-Object fenx_player_singing
-anim
-facings 4
-fenx_singing.110
-fenx_singing.111
-fenx_singing.112
-fenx_singing.130
-fenx_singing.131
-fenx_singing.132
-fenx_singing.150
-fenx_singing.151
-fenx_singing.152
-fenx_singing.170
-fenx_singing.171
-fenx_singing.172
-mina
-end
diff --git a/player/race/fenx.face b/player/race/fenx.face
new file mode 100644
index 000000000..f82f00d3f
--- /dev/null
+++ b/player/race/fenx.face
@@ -0,0 +1,56 @@
+animation fenx_player_sword
+fenx.111
+fenx.112
+fenx.111
+fenx_sword.131
+fenx_sword.132
+fenx_sword.131
+fenx_sword.151
+fenx_sword.152
+fenx_sword.151
+fenx_sword.171
+fenx_sword.172
+fenx_sword.171
+facings 4
+mina
+animation fenx_player_spellcasting
+fenx_spellcasting.151
+fenx_spellcasting.152
+fenx_spellcasting.151
+fenx_spellcasting.151
+fenx_spellcasting.152
+fenx_spellcasting.151
+fenx_spellcasting.151
+fenx_spellcasting.152
+fenx_spellcasting.151
+fenx_spellcasting.151
+fenx_spellcasting.152
+fenx_spellcasting.151
+facings 4
+mina
+animation fenx_player_singing
+facings 4
+fenx_singing.110
+fenx_singing.111
+fenx_singing.112
+fenx_singing.130
+fenx_singing.131
+fenx_singing.132
+fenx_singing.150
+fenx_singing.151
+fenx_singing.152
+fenx_singing.170
+fenx_singing.171
+fenx_singing.172
+mina
+animation fenx_player_class_warrior
+fenx_class_warrior.111
+fenx_class_warrior.112
+fenx_class_warrior.131
+fenx_class_warrior.132
+fenx_class_warrior.151
+fenx_class_warrior.152
+fenx_class_warrior.171
+fenx_class_warrior.172
+facings 4
+mina
diff --git a/player/race/fenx_class_warrior.base.110.png b/player/race/fenx_class_warrior.base.110.png
new file mode 100644
index 000000000..48ec5ecf4
Binary files /dev/null and b/player/race/fenx_class_warrior.base.110.png differ
diff --git a/player/race/fenx_class_warrior.base.111.png b/player/race/fenx_class_warrior.base.111.png
new file mode 100644
index 000000000..b79af1dd2
Binary files /dev/null and b/player/race/fenx_class_warrior.base.111.png differ
diff --git a/player/race/fenx_class_warrior.base.112.png b/player/race/fenx_class_warrior.base.112.png
new file mode 100644
index 000000000..dfac73914
Binary files /dev/null and b/player/race/fenx_class_warrior.base.112.png differ
diff --git a/player/race/fenx_class_warrior.base.130.png b/player/race/fenx_class_warrior.base.130.png
new file mode 100644
index 000000000..0457f083d
Binary files /dev/null and b/player/race/fenx_class_warrior.base.130.png differ
diff --git a/player/race/fenx_class_warrior.base.131.png b/player/race/fenx_class_warrior.base.131.png
new file mode 100644
index 000000000..505b0ef9d
Binary files /dev/null and b/player/race/fenx_class_warrior.base.131.png differ
diff --git a/player/race/fenx_class_warrior.base.132.png b/player/race/fenx_class_warrior.base.132.png
new file mode 100644
index 000000000..397d203d9
Binary files /dev/null and b/player/race/fenx_class_warrior.base.132.png differ
diff --git a/player/race/fenx_class_warrior.base.150.png b/player/race/fenx_class_warrior.base.150.png
new file mode 100644
index 000000000..bcf47bbb5
Binary files /dev/null and b/player/race/fenx_class_warrior.base.150.png differ
diff --git a/player/race/fenx_class_warrior.base.151.png b/player/race/fenx_class_warrior.base.151.png
new file mode 100644
index 000000000..ed991c91f
Binary files /dev/null and b/player/race/fenx_class_warrior.base.151.png differ
diff --git a/player/race/fenx_class_warrior.base.152.png b/player/race/fenx_class_warrior.base.152.png
new file mode 100644
index 000000000..0ee83924e
Binary files /dev/null and b/player/race/fenx_class_warrior.base.152.png differ
diff --git a/player/race/fenx_class_warrior.base.170.png b/player/race/fenx_class_warrior.base.170.png
new file mode 100644
index 000000000..0930fb6ab
Binary files /dev/null and b/player/race/fenx_class_warrior.base.170.png differ
diff --git a/player/race/fenx_class_warrior.base.171.png b/player/race/fenx_class_warrior.base.171.png
new file mode 100644
index 000000000..f30416f1e
Binary files /dev/null and b/player/race/fenx_class_warrior.base.171.png differ
diff --git a/player/race/fenx_class_warrior.base.172.png b/player/race/fenx_class_warrior.base.172.png
new file mode 100644
index 000000000..506e68374
Binary files /dev/null and b/player/race/fenx_class_warrior.base.172.png differ