More WIP on statefull offline