start adding offline support