Moved coordination number changes to separate branch from ALB
Added support for restarts