Add routes and rough
Fix merge