uploading a little more of the tests, did some refactoring in circle, and the corresponding changes in main window to keep things from breaking
merging complete!