wefw
wefw
wefw
filled out routes and controllers
fixes conflict