B166

This is in support of #166.