Moved some code around such that dataProviders are being better utilized.