raft2: wip - to bring in ../raft soon