Added circo functionality.  Much cleaner