[WIP] bootstrapping changes