in progress, adding internal messaging