Routing complete. Also Fixes #6