Added sorting and deleted stuff. Enough for today..