Add routing and move everythign
merge