WIP3
Merge branch 'integration' of https://github.com/Dewwi/heisenberg into integration
WIP