Sorting is underway. All done, I think, apart from Type