About to refactor a bunch of things.
Updated code for fetching data.