Oops
Added missing @Overrides
Partially fixed gears