sortff + unit tests
cleanup
pick + unit tests