Mike/bootstrapped

Merging the start of stuff.
Bootstrapped