preparing to merge with main hyperaudio repo