Submitting this for now, gonna come back to it once it's rerouted with dash (if it's faster) ^^