Correct Update to Logic and Storage class

Ignore previous update, there was conflict in files for previous one.
This is the most updated version.