Implement more storage motion stuff