Added lots of open source changes from Mercian project
Added some changes to router
Stablized all the new components