wip/hs-StateVar
