finish the bootstrap work enough to merge branch in