Feature/js 2.1.0 storage

Note that I haven't added the tickets for this branch to the CHANGELOG yet.
Hey Fred - yes please then, tabs all the way!