WIP : partial port to bootstrap; breaks everything