I think we really need to get a command name in here somewhere otherwise we'll have to change the API later (which would be nice to avoid).