wip
rework Router; that's a lot better