Speeding up data load process
Fixes #6 - Should address the file download bug seen on production