Router re-work #wip

#8