mostly finished --add-server and --consolidate-layout.