HV-256

Depends on #165 which needs to be brought in first