Initial Bootstrapping

Creating a new pull request against the 'bootstrap' branch instead of master.