Fixed CRUCIAL BUG. GO BACK TO THIS COMMIT IF ANYTHING HAPPENS!!!!