Revert "Revert "add Heimdall""

This reverts commit 993fb900d4acb23b9e9917003313903401908d0b.