Hmm - sorry if this breaks something
Merge branch 'ui'
Add hazards from ui
Merge branch 'master' of https://github.com/palacealex/routing into ui