Add Circle and Ellipse, and move hit tests into shapes