little clean up, removed old functions and commented code
added simple router