updated routing
alot of everything everywhere