Progress on bootstrap.go