#83: More work on offline