i dont know what the hell i changed anymore
I HATE THIS SHIT MERGE DAMMIT