Added rest of data grabbing