Initial work on new more flexible routing system