Add scope storage

new scope storage changes to address #45