Alright, gonna merge this. It wasn't tested so whatevs!