Moved stuff around, added saga persistence (with indexing)