initial grunt work for #12
prepare transition to hpfriends