Additions from David-Lee's fork...