adds ellipses and circles
Improved API
Improving code..