Test and improve pasting

Is this a todo that is important before merge or is it a less-important todo?