Move to bootstrap. Other things WIP