Enhancement validate storage

Adds the storage equivalent functionality of PR #7.

DEPENDS: PR #7 
Partially CLOSES: Issues #2, #3