Issue #2260289: cleaning up the mess I made with indexing - mostly working except the jumper