Switched order of assignments, removed routing code.
Start of assignment 3