Up to Commit 5-1, basic routing functionality