Added routing and fixed some stuff