Added lots of circle functionality