If all goes well, I'll finish by Sunday at the latest, this update is going to be very big and with some things I wanted to test
