Some more work on PortalCommand.