Heat integration

Fixes #6