Added this to the #280 todo list.