Categorized most of the data, still some more work is there