Fixed router not being initialized properly, maybe
Attempt to fix merge conflicts