Added routing pattern and some misc work