Working through bugs and router logic