bootstrap refactor wip