refactoring and playing around.
storage tweaks.