Updated Storage component, almost done