Trying out offline storage

Signed-off-by: Bret Comnes <bcomnes@gmail.com>
Merge branch 'offline'
Merge branch 'master' into develop