Allow multiple jumps

Cancelled other pull.
Removed a bug.
I think I'm merging this but I'm not sure