Fixed Gear

Gear had major issues, this is a partial fix.