Initial refactor
Broken service refactoring
Refactor the router
Merge pull request #2 from clintonhalpin/v2-routerRefactor

Refactor the Router to handle alot more data.... delete a bunch of codes