Make rectangle tool work
Get ellipse tool working pretty well