beginnings of offline support