Refactored manual routing code to custom router implementation ...
testing still open :-)