Lots of changes, mainly surrounding the router