Merging hld to new design, interaction still in need of rework