working on diff
finished diff
finished diff sort