new storage, better MVC