New branch, fixing bootstrapping issues