A lot of refactoring- removed the router and lots of other core pieces of code.