First cut at implementing #56