WIP traffic and transit layers working, but needs a lot of refactoring

DO NOT MERGE