First stab at something for #6