added loops and some function re-definitions.  Changed all the shape functions to be more traditional instead of using the circle function.