Work on bootstrap refactor