Flesh out the bootstrap tools