Finishes the re-write for bulk files, closing #285.