update with new router provider system
Merge branch 'devBrian'