Add traffic cameras, and do a lot of refactoring along the way