Inserted salvage load & parsing

See comments on your latest commit.