-More fleshing out of data (still not quite there)