Initial infrastructure
Some bug and test fixes
Implemented n-jump and removing pieces, still a little buggy
fixed merge conflicts