Add sorting mechanism!