R1:4a901c788dc1

Some help pht

Summary: pht

Test Plan: diff review, test shortcuts.

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D5991