Started sorting, needs UI cleanup. Logic works