Updated with what we need to do on future work.
Merge branch 'master' of https://github.com/Boogleoodle/TrafficOMeter