wip/hs-core
