Implements, roughly speaking, and therefore closes, #1827.
Infrastructure which is needed for #1003 #1726 #1555