Ianjorgensen/lollipop

@jebeck  Finished moving the branch. Ready for review.
@jebeck Are you ok with leaving it now that you know the reason?