Some more merge conflicts
Percentiles now work
It works, dont touch