Updated to new router and newer versions of stuff
Merging