Collect drawing operations into Generator class
More rationalising drawing, including outlining
Refactor drawing stuff to use rect(style)s \o/