[WIP] Add sorting