Yes, they clearly should be a single object.