Ianjorgensen/lollipop

@jebeck  Finished moving the branch. Ready for review.
I think that would be good too. But that would happen with a refactoring of the stats module. I didnt want to change that too so i left the boluses as they were.