diff --git a/media/clothing/clothingItems/Amputation_Right_LowerArm.xml b/media/clothing/clothingItems/Amputation_Right_LowerArm.xml
index 7743997..00eddb1 100644
--- a/media/clothing/clothingItems/Amputation_Right_LowerArm.xml
+++ b/media/clothing/clothingItems/Amputation_Right_LowerArm.xml
@@ -9,7 +9,6 @@
     <m_Masks>5</m_Masks>
     <m_Masks>6</m_Masks>
 
-    <m_MasksFolder>none</m_MasksFolder>
     <textureChoices>Amputations\skin01b</textureChoices>
     <textureChoices>Amputations\skin02b</textureChoices>
     <textureChoices>Amputations\skin03b</textureChoices>
diff --git a/media/lua/client/TOC_Debug.lua b/media/lua/client/TOC_Debug.lua
index 26f7d67..c5176d0 100644
--- a/media/lua/client/TOC_Debug.lua
+++ b/media/lua/client/TOC_Debug.lua
@@ -35,3 +35,20 @@ function TocResetEverything()
 
     end
 end
+
+-----------------------------------------------------------------------
+
+
+function TocTestBodyLocations()
+
+    local group = BodyLocations.getGroup("Human")
+    local list = getClassFieldVal(group, getClassField(group, 1))
+
+    for i=1, list:size() do
+ 
+            print(list:get(i -1):getId())
+
+    end
+
+
+end
\ No newline at end of file
diff --git a/media/lua/shared/NPCs/ExtraBodyLocations.lua b/media/lua/shared/NPCs/ExtraBodyLocations.lua
index 237feaf..d75ea39 100644
--- a/media/lua/shared/NPCs/ExtraBodyLocations.lua
+++ b/media/lua/shared/NPCs/ExtraBodyLocations.lua
@@ -1,46 +1,29 @@
---***********************************************************
---**                    THE INDIE STONE                    **
---***********************************************************
-
--- Locations must be declared in render-order.
--- Location IDs must match BodyLocation= and CanBeEquipped= values in items.txt.
-
--- FullBody     1
--- BodyCostume  2
--- FullHat      3
--- Hat          4    
--- MakeUp       5
--- Mask         6
--- JacketHat    7
--- Jacket       8
--- Shirt        9
--- Sweater      10
--- TankTop      11
--- TorsoExtra   12
--- Hands        13
--- Neck         14
--- Scarf        15
--- Pants        16
--- Shorts       17
--- Underwear    18
--- Shoes        19
--- None         20
-
 local function addBodyLocationBefore(newLocation, movetoLocation)
 
-    -- TODO pretty sure this function is borked
+  -- TODO this is still broken!
+  local group = BodyLocations.getGroup("Human")
 
 
-    local group = BodyLocations.getGroup("Human")
-    local list = getClassFieldVal(group, getClassField(group, 1))
-    group:getOrCreateLocation(newLocation)
+
+  local list = getClassFieldVal(group, getClassField(group, 1))
+
+
+
+  group:getOrCreateLocation(newLocation)
+
+
+  local newItem = list:get(list:size()-1)
+  print("TOC: Created new body location" .. newItem:getId())
+
+
+
+
+  list:remove(list:size()-1)
+  local i = group:indexOf(movetoLocation)
+  list:add(i, newItem)
+end
 
 
-    local newItem = list:get(list:size()-1)
-    list:remove(list:size()-1)
-    local i = group:indexOf(movetoLocation)
-    list:add(i, newItem)
-  end
 
 
 local function TocSetSleeves(check)
@@ -50,11 +33,7 @@ local function TocSetSleeves(check)
 
 
 
-    local group = BodyLocations.getGroup("Human")
-    group:getOrCreateLocation("ArmRight_Prot")
-    group:getOrCreateLocation("ArmLeft_Prot")
-    group:getOrCreateLocation("ArmRight")
-    group:getOrCreateLocation("ArmLeft")
+
 
     -- -- Check if we already set stuff before
     -- -- Readd them
@@ -82,4 +61,21 @@ local function TocSetSleeves(check)
 
 end
 
-TocSetSleeves(true)
\ No newline at end of file
+-- FIXME this still breaks
+
+local group = BodyLocations.getGroup("Human")
+
+
+
+
+addBodyLocationBefore("ArmRight", "Shoes")
+addBodyLocationBefore("ArmLeft", "Shoes")
+addBodyLocationBefore("ArmRight_Prot", "Shoes")
+addBodyLocationBefore("ArmLeft_Prot", "Shoes")
+
+
+
+-- group:getOrCreateLocation("ArmRight")
+-- group:getOrCreateLocation("ArmLeft")
+-- group:getOrCreateLocation("ArmRight_Prot")
+-- group:getOrCreateLocation("ArmLeft_Prot")
\ No newline at end of file
diff --git a/media/textures/Amputations/Masks/LeftArm.png b/media/textures/Amputations/Masks/LeftArm.png
new file mode 100644
index 0000000..4cc612c
Binary files /dev/null and b/media/textures/Amputations/Masks/LeftArm.png differ
diff --git a/media/textures/Amputations/Masks/LeftHand.png b/media/textures/Amputations/Masks/LeftHand.png
new file mode 100644
index 0000000..402dee0
Binary files /dev/null and b/media/textures/Amputations/Masks/LeftHand.png differ
diff --git a/media/textures/Amputations/Masks/Mask.png b/media/textures/Amputations/Masks/Mask.png
new file mode 100644
index 0000000..f92a885
Binary files /dev/null and b/media/textures/Amputations/Masks/Mask.png differ
diff --git a/media/textures/Amputations/Masks/RightArm.png b/media/textures/Amputations/Masks/RightArm.png
new file mode 100644
index 0000000..443ec3f
Binary files /dev/null and b/media/textures/Amputations/Masks/RightArm.png differ
diff --git a/media/textures/Amputations/Masks/RightHand.png b/media/textures/Amputations/Masks/RightHand.png
new file mode 100644
index 0000000..c0babe0
Binary files /dev/null and b/media/textures/Amputations/Masks/RightHand.png differ