Preliminary TRP integration.
The other files that should have been in the previous commit.

Because, you know, keeping the commands the same but having them do subtly but significantly different things is a great SCM design choice.