more work on payloadgen