Initial work on custom DIH