Routing functionality initial commit