Save some state so that we don't have to calculate so many things during events
Merge branch 'master' of https://github.com/rgantt/grumpy-rumpy