Added in circles (just randomly decides between circles and rectangles for now). Fixed some issues with shape handling.