separate into MVC properly, router configured correctly