Ianjorgensen/lollipop

@jebeck  Finished moving the branch. Ready for review.
Nitpick, but I think it's convention to only all caps when it's a constructor used with `new`.