First go by Michael

Works for me! I misread your email comments I think. I'll make another commit to this PR.