Changes and basic routing set up