Added a TODO for changing the way paste handling is done