Rebase
Better recursive stores
Recursive stores seem to work!