Working on the Router. Went through multiple changes, but now we will use our own.