Bootstrap integration and refactoring.

Preparing for the call tomorrow here you get a PR. ~~Please don't merge at the current state, it's for review and discussion.~~ Please make your tests like mentioned on the call.