Third time I do this commit, what the hell
WHATEVER BIG UPDATE DONT REALLY KNOW WHAT THIS ALL IS