Made a bunch of crazy changes