Rewrite to prepare for circle
Managed to draw full circle!
Bundle