Refactored BuildVFI to work for large datasets, removed some debugging/logging