Fixes#3 WIP bootstrap