my stuff wants to merge with your stuff
uploading some refactorings for circle.cs