major rewriting still going on--going asynch for storage