Adding annotations and some stuff

Also trying to improve the router a little. WIP