barely any changes
Merge branch 'bottom_routes'
resolving merge conflcit