Initial ideas for #7 and #13