refactored presentation of shapes
cleanup
initial, very rudimentary export to image