Ianjorgensen/lollipop

@jebeck  Finished moving the branch. Ready for review.
I think this can happen once we get the data outside of the payload. It would require a lot of changes