added app-router support, started moving to SPA