First version of router working
Annotation loading
Cleaned up