basic router working
added more
resolve merge conflicts