More hacking. Now have a matrix-based transform stack, which is handy for composing transforms one by one. Fix up other wizards with new drawing helpers and add to test