Refactoring out one of the http calls and mimicking the seed structure

I still have more refactoring to do but now have the hard part done and everything is working as before the refactor so it's a good merge point