basic router working
adds syntax highlighting and notes
added more
resolve merge conflicts