This seems to address, at least in a very preliminary fashion, #305