Initial commit for the refactored hs client - needs more testing and integration with hud