More graphics added, and some baby steps to routing