Added convex objects.  Revamped container types.