merged
apparently im merging
jump now works