Part of the way through camel for #31