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