Adding sort, WIP