intiial work for HC HACS (#19)