Finishes phase VIb, first parts of router.rb