Bootstrap integration and refactoring. WIP!

Preparing for the call tomorrow here you get a PR. Please don't merge at the current state, it's for review and discussion.