whiteboard
yeah routes works
whiteboard mostly works
fix routes merge conflict