added storage manager and related storage stuff