Added Circle vs Circle and Box vs Circle

We now have multiple shapes!