I did this (and some more) in my index payment view PR. ;)