CHecklist expanded and ready for review from team
Merge branch 'master' of https://github.com/Boogleoodle/TrafficOMeter