Ianjorgensen/lollipop

@jebeck  Finished moving the branch. Ready for review.