Persistant disk

Please don't merge this yet. Work in progress...