Ianjorgensen/lollipop

@jebeck  Finished moving the branch. Ready for review.
I'd prefer if we stick to the convention of only using caps when `new` is required. I'm fairly sure we're consistent with that across the rest of tideline.