cabalized some more, but now I broke everything