Updated some stuff. Routes incomplete