More glacier work. Switch to OfflineStoreSupport

SQUASHME