refactor the Socrata class.
Refactor some stuff
Fix conflicts