2-layer routing

Finished 2-layer routing tasks