work on Router and Application logic