Almost finished data organization

Still needs to get name and team from web