Adding sorting I guess