Factored out the 'drawing' code into a Connector class and teased things out a bit. It's a start.