Updated bootstrap branch to prepare for working on it