Cleaning up the model.

I might just switch this over to circle polygons.