some work on controllers and view
refactored storage