Feature/horizon comp node

Fixes #28 and #29