Offline almost complete

Offline almost complete