Remove circle export from main
Add arcs and arrows as primitive types