Bootstrap

I'll send you these pull requests so you can see the changes. Merge them after you look through it!