in the middle of shifting to relative indices, working, but some tests disabled