premerge
Merge branch 'master' of github.com:SourceGroove/Shop
offline start
Half-ass offline first
semi-stable consolidated list model
getting better, but still not there
getting better, but still not there