Some more changes.. Need to get Pandas to work