Payload support

Getting a little funky now.