Minor optimization and routing works
v0.1 works