Got basic routing working :)
Some small modifications