#36 -- [WIP] Extended sorting options