Ianjorgensen/lollipop

@jebeck  Finished moving the branch. Ready for review.
Ohhh, good catch i could not find the source of that error