Offline support wip

Code from Wednesday, April 3rd.