More changes. Not completely working.
Merge branch 'master' of https://github.com/apps8os/trafficsense