We should rollback but also commit when/where needed