skeleton of storage class
Merge remote-tracking branch 'origin/aviral'