Depends on !18581 (merged) but I thought people might want to take a look at some of the things here already.