Some progress with branch drawing code