Made a bunch of things actually work