diff --git a/src/server/server.go b/src/server/server.go
index 7b7bac0506..aff7591c97 100644
--- a/src/server/server.go
+++ b/src/server/server.go
@@ -22,6 +22,7 @@ type Server struct {
 	Config         *configuration.Configuration
 	RequestHandler *coordinator.ProtobufRequestHandler
 	stopped        bool
+	writeLog       *wal.WAL
 }
 
 func NewServer(config *configuration.Configuration) (*Server, error) {
@@ -47,11 +48,6 @@ func NewServer(config *configuration.Configuration) (*Server, error) {
 	clusterConfig := cluster.NewClusterConfiguration(config, writeLog, shardDb, newClient)
 	raftServer := coordinator.NewRaftServer(config, clusterConfig)
 
-	log.Info("Waiting for local server to be added")
-	clusterConfig.WaitForLocalServerLoaded()
-
-	writeLog.SetServerId(clusterConfig.ServerId())
-
 	coord := coordinator.NewCoordinatorImpl(db, raftServer, clusterConfig)
 	go coord.SyncLogs()
 	requestHandler := coordinator.NewProtobufRequestHandler(db, coord, clusterConfig)
@@ -71,7 +67,8 @@ func NewServer(config *configuration.Configuration) (*Server, error) {
 		Coordinator:    coord,
 		AdminServer:    adminServer,
 		Config:         config,
-		RequestHandler: requestHandler}, nil
+		RequestHandler: requestHandler,
+		writeLog:       writeLog}, nil
 }
 
 func (self *Server) ListenAndServe() error {
@@ -82,6 +79,15 @@ func (self *Server) ListenAndServe() error {
 		return err
 	}
 
+	log.Info("Waiting for local server to be added")
+	self.ClusterConfig.WaitForLocalServerLoaded()
+	self.writeLog.SetServerId(self.ClusterConfig.ServerId())
+
+	err = self.recoverFromLog()
+	if err != nil {
+		return err
+	}
+
 	err = self.Coordinator.(*coordinator.CoordinatorImpl).ConnectToProtobufServers(self.Config.ProtobufConnectionString())
 	if err != nil {
 		return err
@@ -93,6 +99,11 @@ func (self *Server) ListenAndServe() error {
 	return nil
 }
 
+func (self *Server) recoverFromLog() error {
+	// TODO: recover from the log: wal.RecoverFromLog....
+	return nil
+}
+
 func (self *Server) Stop() {
 	if self.stopped {
 		return