Put in the final commits from the bootstrapping workshop