moving some more stuff into raft.Raft