Added storage functionality, not yet tested