Moved around the data request code.
Updates to request. wip.