Slightly more polished, still a bit of work to be done on this route though