This now works. With specs to prove it.