refactor code to work with /bootstrap repo
Merge branch 'local'