WIP implementing with-message