Routes and Resolving, minor fixes
added simple server