Upgraded Model classes; upgraded part-draw function.