Did some more work on restore, creates files...