second pass on packaging; works better but offline mode is still in the way