More local storage

// tbd (starting Travis)