move payload to nice es6 cool thing

Please merge the fix-imagepath branch first. Hope this doesn't conflict, if it does it should just mostly be a whitespace thing.