Fixd it FINAl

I swear... NO FURTHER TESTING REQUIRED