8.25 Swapping gears to Abody Unit

Oh no! I knew it when I typed it! Confusion ensued. Please see revision above^^^^^^^^^^^^