Restructure a bit and begin building a core router that can reverse