WIP: PayloadParser refactor in progress