[Portland 2013] Add proposal from Brad Heller