fixed gearswaping

this is a drastic change to how things are done