the data pull mostly works now