Move count method over to views
Merge branch 'master' of https://github.com/christophernies/watersafe