Did more sorting, string manipulation etc.