Saving now runs within a thread