Added capabilities and initial storage work