Um, I think I did a merge?
Added bling, removed cruft.