WiP & faster sort